]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
nfs/localio: use read_seqbegin() rather than read_seqbegin_or_lock()
authorLi RongQing <lirongqing@baidu.com>
Thu, 31 Jul 2025 08:10:38 +0000 (16:10 +0800)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Sun, 3 Aug 2025 19:45:47 +0000 (12:45 -0700)
The usage of read_seqbegin_or_lock() in nfs_copy_boot_verifier()
is wrong. "seq" is always even and thus "or_lock" has no effect.

nfs_copy_boot_verifier() just copies 8 bytes and is supposed to be
very rare operation, so we do not need the adaptive locking in this case.

Signed-off-by: Li RongQing <lirongqing@baidu.com>
Link: https://lore.kernel.org/r/20250731081038.3478-1-lirongqing@baidu.com
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/localio.c

index 510d0a16cfe917da9d04cf37d571d6e150f87a10..bd5fca28589989f63ce3ea2e8436dd7243978709 100644 (file)
@@ -500,14 +500,13 @@ nfs_copy_boot_verifier(struct nfs_write_verifier *verifier, struct inode *inode)
 {
        struct nfs_client *clp = NFS_SERVER(inode)->nfs_client;
        u32 *verf = (u32 *)verifier->data;
-       int seq = 0;
+       unsigned int seq;
 
        do {
-               read_seqbegin_or_lock(&clp->cl_boot_lock, &seq);
+               seq = read_seqbegin(&clp->cl_boot_lock);
                verf[0] = (u32)clp->cl_nfssvc_boot.tv_sec;
                verf[1] = (u32)clp->cl_nfssvc_boot.tv_nsec;
-       } while (need_seqretry(&clp->cl_boot_lock, seq));
-       done_seqretry(&clp->cl_boot_lock, seq);
+       } while (read_seqretry(&clp->cl_boot_lock, seq));
 }
 
 static void