Skip to content

Commit

Permalink
Merge tag 'netfs-lib-fixes-20200525' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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()
  • Loading branch information
Linus Torvalds committed May 25, 2021
2 parents b2db6c3 + b71c791 commit ad9f25d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion fs/netfs/Kconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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
Expand Down
2 changes: 1 addition & 1 deletion fs/netfs/read_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit ad9f25d

Please sign in to comment.