Commit 4a5da3f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-6.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client fixes from Trond Myklebust:

 - NFS/pnfs: Fix a live lock between recalled layouts and layoutget

 - Fix a build warning about an undeclared symbol 'nfs_idmap_cache_timeout'

* tag 'nfs-for-6.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  fs/nfs: fix missing declaration of nfs_idmap_cache_timeout
  NFS/pnfs: Fix a live lock between recalled layouts and layoutget
parents 7684392f bedb4e60

fs/nfs/pnfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo, 
		enum pnfs_iomode *iomode)

{

	/* Serialise LAYOUTGET/LAYOUTRETURN */

	if (atomic_read(&lo->plh_outstanding) != 0)

	if (atomic_read(&lo->plh_outstanding) != 0 && lo->plh_return_seq == 0)

		return false;

	if (test_and_set_bit(NFS_LAYOUT_RETURN_LOCK, &lo->plh_flags))

		return false;

fs/nfs/super.c

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#include "nfs.h"

#include "netns.h"

#include "sysfs.h"

#include "nfs4idmap.h"



#define NFSDBG_FACILITY		NFSDBG_VFS