Commit 1a3b1bba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NFS client fixes from Trond Myklebust:
 "Stable fixes:

   - SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()

  Bugfixes:

   - Fix an Oopsable condition due to SLAB_ACCOUNT setting in the
     NFSv4.2 xattr code.

   - Fix for open() using an file open mode of '3' in NFSv4

   - Replace readdir's use of xxhash() with hash_64()

   - Several patches to handle malloc() failure in SUNRPC"

* tag 'nfs-for-5.18-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Move the call to xprt_send_pagedata() out of xprt_sock_sendmsg()
  SUNRPC: svc_tcp_sendmsg() should handle errors from xdr_alloc_bvec()
  SUNRPC: Handle allocation failure in rpc_new_task()
  NFS: Ensure rpc_run_task() cannot fail in nfs_async_rename()
  NFSv4/pnfs: Handle RPC allocation errors in nfs4_proc_layoutget
  SUNRPC: Handle low memory situations in call_status()
  SUNRPC: Handle ENOMEM in call_transmit_status()
  NFSv4.2: Fix missing removal of SLAB_ACCOUNT on kmem_cache allocation
  SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()
  NFS: Replace readdir's use of xxhash() with hash_64()
  SUNRPC: handle malloc failure in ->request_prepare
  NFSv4: fix open failure with O_ACCMODE flag
  Revert "NFSv4: Handle the special Linux file open access mode"
parents c0aa5338 ff053dbb

fs/file_table.c

+1 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ void __fput_sync(struct file *file) 
}



EXPORT_SYMBOL(fput);

EXPORT_SYMBOL(__fput_sync);



void __init files_init(void)

{

fs/nfs/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ config NFS_FS 
	depends on INET && FILE_LOCKING && MULTIUSER

	select LOCKD

	select SUNRPC

	select CRYPTO

	select CRYPTO_HASH

	select XXHASH

	select CRYPTO_XXHASH

	select NFS_ACL_SUPPORT if NFS_V3_ACL

	help

	  Choose Y here if you want to access files residing on other

fs/nfs/dir.c

+3 −16
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <linux/sched.h>

#include <linux/kmemleak.h>

#include <linux/xattr.h>

#include <linux/xxhash.h>

#include <linux/hash.h>



#include "delegation.h"

#include "iostat.h"
@@ -350,10 +350,7 @@ static int nfs_readdir_page_array_append(struct page *page, 
 * of directory cookies. Content is addressed by the value of the

 * cookie index of the first readdir entry in a page.

 *

 * The xxhash algorithm is chosen because it is fast, and is supposed

 * to result in a decent flat distribution of hashes.

 *

 * We then select only the first 18 bits to avoid issues with excessive

 * We select only the first 18 bits to avoid issues with excessive

 * memory use for the page cache XArray. 18 bits should allow the caching

 * of 262144 pages of sequences of readdir entries. Since each page holds

 * 127 readdir entries for a typical 64-bit system, that works out to a
@@ -363,7 +360,7 @@ static pgoff_t nfs_readdir_page_cookie_hash(u64 cookie) 
{

	if (cookie == 0)

		return 0;

	return xxhash(&cookie, sizeof(cookie), 0) & NFS_READDIR_COOKIE_MASK;

	return hash_64(cookie, 18);

}



static bool nfs_readdir_page_validate(struct page *page, u64 last_cookie,
@@ -1991,16 +1988,6 @@ const struct dentry_operations nfs4_dentry_operations = { 
};

EXPORT_SYMBOL_GPL(nfs4_dentry_operations);



static fmode_t flags_to_mode(int flags)

{

	fmode_t res = (__force fmode_t)flags & FMODE_EXEC;

	if ((flags & O_ACCMODE) != O_WRONLY)

		res |= FMODE_READ;

	if ((flags & O_ACCMODE) != O_RDONLY)

		res |= FMODE_WRITE;

	return res;

}



static struct nfs_open_context *create_nfs_open_context(struct dentry *dentry, int open_flags, struct file *filp)

{

	return alloc_nfs_open_context(dentry, flags_to_mode(open_flags), filp);

fs/nfs/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -1180,7 +1180,6 @@ int nfs_open(struct inode *inode, struct file *filp) 
	nfs_fscache_open_file(inode, filp);

	return 0;

}

EXPORT_SYMBOL_GPL(nfs_open);



/*

 * This function is called whenever some part of NFS notices that

fs/nfs/internal.h

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,16 @@ static inline bool nfs_lookup_is_soft_revalidate(const struct dentry *dentry) 
	return true;

}



static inline fmode_t flags_to_mode(int flags)

{

	fmode_t res = (__force fmode_t)flags & FMODE_EXEC;

	if ((flags & O_ACCMODE) != O_WRONLY)

		res |= FMODE_READ;

	if ((flags & O_ACCMODE) != O_RDONLY)

		res |= FMODE_WRITE;

	return res;

}



/*

 * Note: RFC 1813 doesn't limit the number of auth flavors that

 * a server can return, so make something up.