1 files changed, 4 insertions, 4 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index e5bbc1f30f16..8ed049d1e332 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -654,7 +654,7 @@ xfs_ialloc(
         xfs_inode_t     *ip;
         uint            flags;
         int             error;
-        timespec_t      tv;
+        struct timespec tv;
 
         /*
          * Call the space management code to pick
@@ -720,7 +720,7 @@ xfs_ialloc(
         ip->i_d.di_nextents = 0;
         ASSERT(ip->i_d.di_nblocks == 0);
 
-        nanotime(&tv);
+        tv = current_fs_time(mp->m_super);
         ip->i_d.di_mtime.t_sec = (__int32_t)tv.tv_sec;
         ip->i_d.di_mtime.t_nsec = (__int32_t)tv.tv_nsec;
         ip->i_d.di_atime = ip->i_d.di_mtime;
@@ -769,6 +769,8 @@ xfs_ialloc(
                                         di_flags |= XFS_DIFLAG_EXTSZINHERIT;
                                         ip->i_d.di_extsize = pip->i_d.di_extsize;
                                 }
+                                if (pip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
+                                        di_flags |= XFS_DIFLAG_PROJINHERIT;
                         } else if (S_ISREG(mode)) {
                                 if (pip->i_d.di_flags & XFS_DIFLAG_RTINHERIT)
                                         di_flags |= XFS_DIFLAG_REALTIME;
@@ -789,8 +791,6 @@ xfs_ialloc(
                         if ((pip->i_d.di_flags & XFS_DIFLAG_NOSYMLINKS) &&
                             xfs_inherit_nosymlinks)
                                 di_flags |= XFS_DIFLAG_NOSYMLINKS;
-                        if (pip->i_d.di_flags & XFS_DIFLAG_PROJINHERIT)
-                                di_flags |= XFS_DIFLAG_PROJINHERIT;
                         if ((pip->i_d.di_flags & XFS_DIFLAG_NODEFRAG) &&
                             xfs_inherit_nodefrag)
                                 di_flags |= XFS_DIFLAG_NODEFRAG;