2015-04-14 18:27:16

by Anna Schumaker

Subject: [PATCH] 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 <[email protected]>
---
fs/nfs/client.c | 1 -
fs/nfs/super.c | 1 -
include/linux/nfs_idmap.h | 11 -----------
3 files changed, 13 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 1987415..892aeff 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -31,7 +31,6 @@
#include <linux/lockd/bind.h>
#include <linux/seq_file.h>
#include <linux/mount.h>
-#include <linux/nfs_idmap.h>
#include <linux/vfs.h>
#include <linux/inet.h>
#include <linux/in6.h>
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 54a079a..e862093 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -43,7 +43,6 @@
#include <linux/seq_file.h>
#include <linux/mount.h>
#include <linux/namei.h>
-#include <linux/nfs_idmap.h>
#include <linux/vfs.h>
#include <linux/inet.h>
#include <linux/in6.h>
diff --git a/include/linux/nfs_idmap.h b/include/linux/nfs_idmap.h
index 333844e..daaf3ea 100644
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
@@ -46,19 +46,8 @@ struct nfs_server;
struct nfs_fattr;
struct nfs4_string;

-#if IS_ENABLED(CONFIG_NFS_V4)
int nfs_idmap_init(void);
void nfs_idmap_quit(void);
-#else
-static inline int nfs_idmap_init(void)
-{
- return 0;
-}
-
-static inline void nfs_idmap_quit(void)
-{}
-#endif
-
int nfs_idmap_new(struct nfs_client *);
void nfs_idmap_delete(struct nfs_client *);

--
2.3.5

2015-04-14 19:22:22

by Christoph Hellwig

Subject: Re: [PATCH] NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h

On Tue, Apr 14, 2015 at 02:27:12PM -0400, Anna Schumaker wrote:
> 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.


Reviewed-by: Christoph Hellwig <[email protected]>

Seems like the header should move to fs/nfs/ as well..

2015-04-14 19:24:00

by Anna Schumaker

Subject: Re: [PATCH] NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h

On 04/14/2015 03:22 PM, Christoph Hellwig wrote:
> On Tue, Apr 14, 2015 at 02:27:12PM -0400, Anna Schumaker wrote:
>> 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.
>
>
> Reviewed-by: Christoph Hellwig <[email protected]>
>
> Seems like the header should move to fs/nfs/ as well..
>

Want me to send another patch moving the header? Are there guidelines for when a header should be in include/ and when it should be in our subdirectory?

Anna