diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-25 19:24:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-25 19:24:06 -0700 |
| commit | 8b728edc5be161799434cc17e1279db2f8eabe29 (patch) | |
| tree | 756e64f2835f20a830ac041c70b748ce07754531 /fs | |
| parent | 3f306ea2e18568f693f7763d1c2178f349ae8f31 (diff) | |
| parent | 2999e1e387271b3216c44168b0c5cc69f647f155 (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext2/inode.c | 1 | ||||
| -rw-r--r-- | fs/fs-writeback.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 9e1ecd89f47f..360ce3604a2d 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -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" diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index a1074a26e784..a21d8f1a56d1 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -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. |