Subject: Re: linux-next: build failure after merge of the vfs tree

From: Al Viro <[email-masked]>
Date: Thu, 11 Dec 2014 02:32:53 +0000

On Wed, Dec 10, 2014 at 06:45:37PM +1100, Stephen Rothwell wrote:
> Hi Al,
> 
> After merging the vfs tree, today's linux-next build (powerpc
> allnoconfig) failed like this:

> diff --git a/fs/nsfs.c b/fs/nsfs.c
> index 0791d086804d..7d98db03c2ce 100644
> --- a/fs/nsfs.c
> +++ b/fs/nsfs.c
> @@ -3,6 +3,8 @@
>  #include <linux/fs.h>
>  #include <linux/proc_ns.h>
>  #include <linux/magic.h>
> +#include <linux/ktime.h>
> +#include <linux/timekeeping.h>

Umm...  Either it's time.h + timekeeping.h or ktime.h alone - ktime.h
pulls timekeeping.h and time.h.  For now I went with the latter variant.
However, I wonder if longer term it would be better to provide a variant
of new_inode_pseudo() that would set the timestamps that way - only two
callers (new_inode() and sock_alloc()) do not do exactly that.  Oh, well -
that can wait...

For now, fixed and force-pushed