diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-02 06:19:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-02 06:19:49 +0300 |
| commit | 8adcc59974b8a65b7eac7d503364837c297139bc (patch) | |
| tree | 4ab2a60bb6d058e5b18d175fc4c97c9c05f13185 /fs/iomap.c | |
| parent | 9931a07d518e86eb58a75e508ed9626f86359303 (diff) | |
| parent | 3642b29a63674020401e41185ed5b0e3c056ab4a (diff) | |
| download | linux-8adcc59974b8a65b7eac7d503364837c297139bc.tar.xz | |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"No common topic, really - a handful of assorted stuff; the least
trivial bits are Mark's dedupe patches"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs/exofs: only use true/false for asignment of bool type variable
fs/exofs: fix potential memory leak in mount option parsing
Delete invalid assignment statements in do_sendfile
iomap: remove duplicated include from iomap.c
vfs: dedupe should return EPERM if permission is not granted
vfs: allow dedupe of user owned read-only files
ntfs: don't open-code ERR_CAST
ext4: don't open-code ERR_CAST
Diffstat (limited to 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 970ee3964e98..64ce240217a1 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -30,7 +30,6 @@ #include <linux/task_io_accounting_ops.h> #include <linux/dax.h> #include <linux/sched/signal.h> -#include <linux/swap.h> #include "internal.h" |