From patchwork Wed Dec 6 15:12:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Konstantin Komarov X-Patchwork-Id: 13481928 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=paragon-software.com header.i=@paragon-software.com header.b="ml0RcwIB" Received: from relayaws-01.paragon-software.com (relayaws-01.paragon-software.com [35.157.23.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52FF1C6; Wed, 6 Dec 2023 07:12:06 -0800 (PST) Received: from dlg2.mail.paragon-software.com (vdlg-exch-02.paragon-software.com [172.30.1.105]) by relayaws-01.paragon-software.com (Postfix) with ESMTPS id 2AAFC2120; Wed, 6 Dec 2023 15:05:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paragon-software.com; s=mail; t=1701875140; bh=KEnz3KTE1Z9/osOlDauLKgWtI6LdwFBhWwhEahHqNQo=; h=Date:Subject:From:To:CC:References:In-Reply-To; b=ml0RcwIB/jbk6KHc50rd9/kLCglaBQgfFiOHbhazURkapxReFpC4vxnpvlYMS8nrP 58adYEG0RnhgyeLDEMwND0AqrD9TZFlz6HTNiuDEmvzUmC5+PXmjU2b3YGybT7p0QH p4lAjZYfowSTC2GQFaBSEjxTjNgDlilQX4n/rSpU= Received: from [172.16.192.129] (192.168.211.144) by vdlg-exch-02.paragon-software.com (172.30.1.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.7; Wed, 6 Dec 2023 18:12:03 +0300 Message-ID: <7ae15d02-7745-4241-8b28-197eebbb6b7b@paragon-software.com> Date: Wed, 6 Dec 2023 18:12:03 +0300 Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 07/16] fs/ntfs3: Fix multithreaded stress test Content-Language: en-US From: Konstantin Komarovc To: CC: , References: <00fd1558-fda5-421b-be43-7de69e32cb4e@paragon-software.com> In-Reply-To: <00fd1558-fda5-421b-be43-7de69e32cb4e@paragon-software.com> X-ClientProxiedBy: vobn-exch-01.paragon-software.com (172.30.72.13) To vdlg-exch-02.paragon-software.com (172.30.1.105) Signed-off-by: Konstantin Komarov ---  fs/ntfs3/attrib.c | 21 ++++++++++++++-------  1 file changed, 14 insertions(+), 7 deletions(-)      CLST hint, svcn, to_alloc, evcn1, next_svcn, asize, end, vcn0, alen; @@ -904,12 +904,8 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,          *len = 0;      up_read(&ni->file.run_lock); -    if (*len) { -        if (*lcn != SPARSE_LCN || !new) -            return 0; /* Fast normal way without allocation. */ -        else if (clen > *len) -            clen = *len; -    } +    if (*len && (*lcn != SPARSE_LCN || !new)) +        return 0; /* Fast normal way without allocation. */      /* No cluster in cache or we need to allocate cluster in hole. */      sbi = ni->mi.sbi; @@ -918,6 +914,17 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,      ni_lock(ni);      down_write(&ni->file.run_lock); +    /* Repeat the code above (under write lock). */ +    if (!run_lookup_entry(run, vcn, lcn, len, NULL)) +        *len = 0; + +    if (*len) { +        if (*lcn != SPARSE_LCN || !new) +            goto out; /* normal way without allocation. */ +        if (clen > *len) +            clen = *len; +    } +      le_b = NULL;      attr_b = ni_find_attr(ni, NULL, &le_b, ATTR_DATA, NULL, 0, NULL, &mi_b);      if (!attr_b) { diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c index 63f70259edc0..4b78b669a3bd 100644 --- a/fs/ntfs3/attrib.c +++ b/fs/ntfs3/attrib.c @@ -886,7 +886,7 @@ int attr_data_get_block(struct ntfs_inode *ni, CLST vcn, CLST clen, CLST *lcn,      struct runs_tree *run = &ni->file.run;      struct ntfs_sb_info *sbi;      u8 cluster_bits; -    struct ATTRIB *attr = NULL, *attr_b; +    struct ATTRIB *attr, *attr_b;      struct ATTR_LIST_ENTRY *le, *le_b;      struct mft_inode *mi, *mi_b;