Merge tag 'x86-cleanups-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / nfs / write.c

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index b664caea8b4e6704bc0b46e8388487999697b80b..7248705faef47cbf60b394d4921d2c92831e039f 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -192,13 +192,13 @@ static struct nfs_page *nfs_folio_find_private_request(struct folio *folio)
 
        if (!folio_test_private(folio))
                return NULL;
 
        if (!folio_test_private(folio))
                return NULL;

-       spin_lock(&mapping->private_lock);
+       spin_lock(&mapping->i_private_lock);

        req = nfs_folio_private_request(folio);
        if (req) {
                WARN_ON_ONCE(req->wb_head != req);
                kref_get(&req->wb_kref);
        }
        req = nfs_folio_private_request(folio);
        if (req) {
                WARN_ON_ONCE(req->wb_head != req);
                kref_get(&req->wb_kref);
        }

-       spin_unlock(&mapping->private_lock);
+       spin_unlock(&mapping->i_private_lock);

        return req;
 }
 
        return req;
 }
 


@@ -769,13 +769,13 @@ static void nfs_inode_add_request(struct nfs_page *req)
         * Swap-space should not get truncated. Hence no need to plug the race
         * with invalidate/truncate.
         */
         * Swap-space should not get truncated. Hence no need to plug the race
         * with invalidate/truncate.
         */

-       spin_lock(&mapping->private_lock);
+       spin_lock(&mapping->i_private_lock);

        if (likely(!folio_test_swapcache(folio))) {
                set_bit(PG_MAPPED, &req->wb_flags);
                folio_set_private(folio);
                folio->private = req;
        }
        if (likely(!folio_test_swapcache(folio))) {
                set_bit(PG_MAPPED, &req->wb_flags);
                folio_set_private(folio);
                folio->private = req;
        }

-       spin_unlock(&mapping->private_lock);
+       spin_unlock(&mapping->i_private_lock);

        atomic_long_inc(&nfsi->nrequests);
        /* this a head request for a page group - mark it as having an
         * extra reference so sub groups can follow suit.
        atomic_long_inc(&nfsi->nrequests);
        /* this a head request for a page group - mark it as having an
         * extra reference so sub groups can follow suit.


@@ -796,13 +796,13 @@ static void nfs_inode_remove_request(struct nfs_page *req)
                struct folio *folio = nfs_page_to_folio(req->wb_head);
                struct address_space *mapping = folio_file_mapping(folio);
 
                struct folio *folio = nfs_page_to_folio(req->wb_head);
                struct address_space *mapping = folio_file_mapping(folio);
 

-               spin_lock(&mapping->private_lock);
+               spin_lock(&mapping->i_private_lock);

                if (likely(folio && !folio_test_swapcache(folio))) {
                        folio->private = NULL;
                        folio_clear_private(folio);
                        clear_bit(PG_MAPPED, &req->wb_head->wb_flags);
                }
                if (likely(folio && !folio_test_swapcache(folio))) {
                        folio->private = NULL;
                        folio_clear_private(folio);
                        clear_bit(PG_MAPPED, &req->wb_head->wb_flags);
                }

-               spin_unlock(&mapping->private_lock);
+               spin_unlock(&mapping->i_private_lock);

        }
 
        if (test_and_clear_bit(PG_INODE_REF, &req->wb_flags)) {
        }
 
        if (test_and_clear_bit(PG_INODE_REF, &req->wb_flags)) {