* [PATCH] nfsd: kill unused ENT_HASHMASK definition
@ 2011-01-14 8:39 Shan Wei
2011-01-14 9:35 ` [PATCH v2] nfsd: kill unused macro definition Shan Wei
0 siblings, 1 reply; 3+ messages in thread
From: Shan Wei @ 2011-01-14 8:39 UTC (permalink / raw)
To: bfields, neilb, linux-nfs, Kernel-Maillist
This macro definition has not been using since v2.6.12-rc2.
So, remove it now.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
fs/nfsd/nfs4idmap.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index f0695e8..ce0f6b9 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -62,7 +62,6 @@ struct ent {
#define ENT_HASHBITS 8
#define ENT_HASHMAX (1 << ENT_HASHBITS)
-#define ENT_HASHMASK (ENT_HASHMAX - 1)
static void
ent_init(struct cache_head *cnew, struct cache_head *citm)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] nfsd: kill unused macro definition
2011-01-14 8:39 [PATCH] nfsd: kill unused ENT_HASHMASK definition Shan Wei
@ 2011-01-14 9:35 ` Shan Wei
2011-01-18 21:58 ` J. Bruce Fields
0 siblings, 1 reply; 3+ messages in thread
From: Shan Wei @ 2011-01-14 9:35 UTC (permalink / raw)
To: bfields, neilb, linux-nfs, Kernel-Maillist
These macros had never been used for several years.
So, remove them.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
V2: add two other unused macros, EXPORT_HASHMASK and FILE_HASH_MASK.
---
fs/nfsd/export.c | 1 -
fs/nfsd/nfs4idmap.c | 1 -
fs/nfsd/nfs4state.c | 2 +-
3 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index c0fcb7a..98a964a 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -300,7 +300,6 @@ svc_expkey_update(struct svc_expkey *new, struct svc_expkey *old)
#define EXPORT_HASHBITS 8
#define EXPORT_HASHMAX (1<< EXPORT_HASHBITS)
-#define EXPORT_HASHMASK (EXPORT_HASHMAX -1)
static struct cache_head *export_table[EXPORT_HASHMAX];
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index f0695e8..ce0f6b9 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -62,7 +62,6 @@ struct ent {
#define ENT_HASHBITS 8
#define ENT_HASHMAX (1 << ENT_HASHBITS)
-#define ENT_HASHMASK (ENT_HASHMAX - 1)
static void
ent_init(struct cache_head *cnew, struct cache_head *citm)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index fbd18c3..547fbc6 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -148,7 +148,7 @@ static struct list_head ownerstr_hashtbl[OWNER_HASH_SIZE];
/* hash table for nfs4_file */
#define FILE_HASH_BITS 8
#define FILE_HASH_SIZE (1 << FILE_HASH_BITS)
-#define FILE_HASH_MASK (FILE_HASH_SIZE - 1)
+
/* hash table for (open)nfs4_stateid */
#define STATEID_HASH_BITS 10
#define STATEID_HASH_SIZE (1 << STATEID_HASH_BITS)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] nfsd: kill unused macro definition
2011-01-14 9:35 ` [PATCH v2] nfsd: kill unused macro definition Shan Wei
@ 2011-01-18 21:58 ` J. Bruce Fields
0 siblings, 0 replies; 3+ messages in thread
From: J. Bruce Fields @ 2011-01-18 21:58 UTC (permalink / raw)
To: Shan Wei; +Cc: neilb, linux-nfs, Kernel-Maillist
On Fri, Jan 14, 2011 at 05:35:59PM +0800, Shan Wei wrote:
> These macros had never been used for several years.
> So, remove them.
Thanks, applying.--b.
>
> Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
> ---
> V2: add two other unused macros, EXPORT_HASHMASK and FILE_HASH_MASK.
>
> ---
> fs/nfsd/export.c | 1 -
> fs/nfsd/nfs4idmap.c | 1 -
> fs/nfsd/nfs4state.c | 2 +-
> 3 files changed, 1 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
> index c0fcb7a..98a964a 100644
> --- a/fs/nfsd/export.c
> +++ b/fs/nfsd/export.c
> @@ -300,7 +300,6 @@ svc_expkey_update(struct svc_expkey *new, struct svc_expkey *old)
>
> #define EXPORT_HASHBITS 8
> #define EXPORT_HASHMAX (1<< EXPORT_HASHBITS)
> -#define EXPORT_HASHMASK (EXPORT_HASHMAX -1)
>
> static struct cache_head *export_table[EXPORT_HASHMAX];
>
> diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
> index f0695e8..ce0f6b9 100644
> --- a/fs/nfsd/nfs4idmap.c
> +++ b/fs/nfsd/nfs4idmap.c
> @@ -62,7 +62,6 @@ struct ent {
>
> #define ENT_HASHBITS 8
> #define ENT_HASHMAX (1 << ENT_HASHBITS)
> -#define ENT_HASHMASK (ENT_HASHMAX - 1)
>
> static void
> ent_init(struct cache_head *cnew, struct cache_head *citm)
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index fbd18c3..547fbc6 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -148,7 +148,7 @@ static struct list_head ownerstr_hashtbl[OWNER_HASH_SIZE];
> /* hash table for nfs4_file */
> #define FILE_HASH_BITS 8
> #define FILE_HASH_SIZE (1 << FILE_HASH_BITS)
> -#define FILE_HASH_MASK (FILE_HASH_SIZE - 1)
> +
> /* hash table for (open)nfs4_stateid */
> #define STATEID_HASH_BITS 10
> #define STATEID_HASH_SIZE (1 << STATEID_HASH_BITS)
> --
> 1.6.3.3
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-18 21:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-14 8:39 [PATCH] nfsd: kill unused ENT_HASHMASK definition Shan Wei
2011-01-14 9:35 ` [PATCH v2] nfsd: kill unused macro definition Shan Wei
2011-01-18 21:58 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).