On Mon, Jun 12, 2017 at 07:47:19AM -0700, Dan Williams wrote: > On Mon, Jun 12, 2017 at 5:07 AM, Kirill A. Shutemov > <kirill.shutemov@xxxxxxxxxxxxxxx> wrote: > > On Sat, Jun 10, 2017 at 02:49:37PM -0700, Dan Williams wrote: > >> diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > >> index c4706e2c3358..901ed3767d1b 100644 > >> --- a/include/linux/huge_mm.h > >> +++ b/include/linux/huge_mm.h > >> @@ -1,6 +1,8 @@ > >> #ifndef _LINUX_HUGE_MM_H > >> #define _LINUX_HUGE_MM_H > >> > >> +#include <linux/fs.h> > >> + > > > > It means <linux/mm.h> now depends on <linux/fs.h>. I don't think it's a > > good idea. > > Seems to be ok as far as 0day-kbuild-robot is concerned. The > alternative is to move vma_is_dax() out of line. I think > transparent_hugepage_enabled() is called frequently enough to make it > worth it to keep it inline. Yea, I played with moving vma_is_dax() to include/linux/mm.h instead, but ran into the issue where IS_DAX() is defined in include/linux/fs.h. So, any way we slice it we end up requiring both MM and FS includes for this to work. Since the way you have it here apparently works and passes zero-day, my vote is to just go with it.
