Commit ad9f25d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'netfs-lib-fixes-20200525' of... 

Merge tag 'netfs-lib-fixes-20200525' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull netfs fixes from David Howells:
 "A couple of fixes to the new netfs lib:

   - Pass the AOP flags through from netfs_write_begin() into
     grab_cache_page_write_begin().

   - Automatically enable in Kconfig netfs lib rather than presenting an
     option for manual enablement"

* tag 'netfs-lib-fixes-20200525' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  netfs: Make CONFIG_NETFS_SUPPORT auto-selected rather than manual
  netfs: Pass flags through to grab_cache_page_write_begin()
parents b2db6c35 b71c7912

fs/netfs/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



config NETFS_SUPPORT

	tristate "Support for network filesystem high-level I/O"

	tristate

	help

	  This option enables support for network filesystems, including

	  helpers for high-level buffered I/O, abstracting out read

fs/netfs/read_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, 
	DEFINE_READAHEAD(ractl, file, NULL, mapping, index);



retry:

	page = grab_cache_page_write_begin(mapping, index, 0);

	page = grab_cache_page_write_begin(mapping, index, flags);

	if (!page)

		return -ENOMEM;