tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h

The idmapper is completely internal to the NFS v4 module, so this macro
will always evaluate to true. This patch also removes unnecessary
includes of this file from the generic NFS client.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

authored by

Anna Schumaker and committed by
Trond Myklebust f9ebd618 7c61f0d3

-13
-1
fs/nfs/client.c
··· 31 31 #include <linux/lockd/bind.h> 32 32 #include <linux/seq_file.h> 33 33 #include <linux/mount.h> 34 - #include <linux/nfs_idmap.h> 35 34 #include <linux/vfs.h> 36 35 #include <linux/inet.h> 37 36 #include <linux/in6.h>
-1
fs/nfs/super.c
··· 43 43 #include <linux/seq_file.h> 44 44 #include <linux/mount.h> 45 45 #include <linux/namei.h> 46 - #include <linux/nfs_idmap.h> 47 46 #include <linux/vfs.h> 48 47 #include <linux/inet.h> 49 48 #include <linux/in6.h>
-11
include/linux/nfs_idmap.h
··· 46 46 struct nfs_fattr; 47 47 struct nfs4_string; 48 48 49 - #if IS_ENABLED(CONFIG_NFS_V4) 50 49 int nfs_idmap_init(void); 51 50 void nfs_idmap_quit(void); 52 - #else 53 - static inline int nfs_idmap_init(void) 54 - { 55 - return 0; 56 - } 57 - 58 - static inline void nfs_idmap_quit(void) 59 - {} 60 - #endif 61 - 62 51 int nfs_idmap_new(struct nfs_client *); 63 52 void nfs_idmap_delete(struct nfs_client *); 64 53