• Stephen Rothwell's avatar
    cifs: update for current_kernel_time64() removal · 54e4f73c
    Stephen Rothwell authored
    Fixes cifs build failure after merge of the y2038 tree
    
    After merging the y2038 tree, today's linux-next build (x86_64
    allmodconfig) failed like this:
    
    fs/cifs/dfs_cache.c: In function 'cache_entry_expired':
    fs/cifs/dfs_cache.c:106:7: error: implicit declaration of function 'current_kernel_time64'; did you mean 'core_kernel_text'? [-Werror=implicit-function-declaration]
      ts = current_kernel_time64();
           ^~~~~~~~~~~~~~~~~~~~~
           core_kernel_text
    fs/cifs/dfs_cache.c:106:5: error: incompatible types when assigning to type 'struct timespec64' from type 'int'
      ts = current_kernel_time64();
         ^
    fs/cifs/dfs_cache.c: In function 'get_expire_time':
    fs/cifs/dfs_cache.c:342:24: error: incompatible type for argument 1 of 'timespec64_add'
      return timespec64_add(current_kernel_time64(), ts);
                            ^~~~~~~~~~~~~~~~~~~~~~~
    In file included from include/linux/restart_block.h:10,
                     from include/linux/thread_info.h:13,
                     from arch/x86/include/asm/preempt.h:7,
                     from include/linux/preempt.h:78,
                     from include/linux/rcupdate.h:40,
                     from fs/cifs/dfs_cache.c:8:
    include/linux/time64.h:66:66: note: expected 'struct timespec64' but argument is of type 'int'
     static inline struct timespec64 timespec64_add(struct timespec64 lhs,
                                                    ~~~~~~~~~~~~~~~~~~^~~
    fs/cifs/dfs_cache.c:343:1: warning: control reaches end of non-void function [-Wreturn-type]
     }
     ^
    
    Caused by:
    
      commit ccea641b6742 ("timekeeping: remove obsolete time accessors")
    
    interacting with:
      commit 34a44fb160f9 ("cifs: Add DFS cache routines")
    
    from the cifs tree.
    Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
    Reviewed-by: default avatarPaulo Alcantara <palcantara@suse.de>
    Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
    Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
    54e4f73c
dfs_cache.c 31.3 KB