git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
fs
/
nfsd
/
blocklayout.c
diff --git
a/fs/nfsd/blocklayout.c
b/fs/nfsd/blocklayout.c
index 31f3df193bdbb47b82dbe8df7f67b33163d55828..ad2c05e80a836fcc49002802357f049f61852732 100644
(file)
--- a/
fs/nfsd/blocklayout.c
+++ b/
fs/nfsd/blocklayout.c
@@
-2,6
+2,7
@@
* Copyright (c) 2014-2016 Christoph Hellwig.
*/
#include <linux/exportfs.h>
+#include <linux/iomap.h>
#include <linux/genhd.h>
#include <linux/slab.h>
#include <linux/pr.h>