Commit 8b728edc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fs_for_v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull writeback and ext2 cleanups from Jan Kara:
 "One small ext2 cleanup and one writeback spelling fix"

* tag 'fs_for_v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  writeback: fix typo in comment
  fs: ext2: Fix duplicate included linux/dax.h
parents 3f306ea2 2999e1e3

fs/ext2/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/iomap.h>

#include <linux/namei.h>

#include <linux/uio.h>

#include <linux/dax.h>

#include "ext2.h"

#include "acl.h"

#include "xattr.h"

fs/fs-writeback.c

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ EXPORT_SYMBOL_GPL(wbc_attach_and_unlock_inode); 
 * incorrectly attributed).

 *

 * To resolve this issue, cgroup writeback detects the majority dirtier of

 * an inode and transfers the ownership to it.  To avoid unnnecessary

 * an inode and transfers the ownership to it.  To avoid unnecessary

 * oscillation, the detection mechanism keeps track of history and gives

 * out the switch verdict only if the foreign usage pattern is stable over

 * a certain amount of time and/or writeback attempts.