diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-13 20:15:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-13 20:15:49 -0800 |
| commit | 7c5cac1bc7170bfc726a69eb64947c55658d16ad (patch) | |
| tree | af8a13c25b9c8298826202ac233bfd78ec34cc8b /fs/xfs/scrub/scrub.c | |
| parent | 4e746cf4f721d6397bace501f5feadb46eec1314 (diff) | |
| parent | b7e0b6ff54dd92febbb1914ab93cd6a21622e169 (diff) | |
| download | linux-7c5cac1bc7170bfc726a69eb64947c55658d16ad.tar.bz2 | |
Merge tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
"Here are a few more bug fixes & cleanups for 4.15-rc4:
- clean up duplicate includes
- remove ancient 'no-alloc' crap code that occasionally caused hard
fs shutdowns due to lack of proper space reservations
- fix regression in FIEMAP behavior when reporting xattr extents"
* tag 'xfs-4.15-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: make iomap_begin functions trim iomaps consistently
xfs: remove "no-allocation" reservations for file creations
fs: xfs: remove duplicate includes
Diffstat (limited to 'fs/xfs/scrub/scrub.c')
| -rw-r--r-- | fs/xfs/scrub/scrub.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c index 9c42c4efd01e..ab3aef2ae823 100644 --- a/fs/xfs/scrub/scrub.c +++ b/fs/xfs/scrub/scrub.c @@ -46,7 +46,6 @@ #include "scrub/scrub.h" #include "scrub/common.h" #include "scrub/trace.h" -#include "scrub/scrub.h" #include "scrub/btree.h" /* |