From: Kinglong Mee <kinglongmee@gmail.com>
To: "J. Bruce Fields" <bfields@fieldses.org>,
"linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>
Cc: kinglongmee@gmail.com
Subject: [PATCH 3/5] nfsd: Remove duplicate define of IDMAP_NAMESZ/IDMAP_TYPE_xx
Date: Fri, 03 Jul 2015 19:36:14 +0800 [thread overview]
Message-ID: <559673AE.5020308@gmail.com> (raw)
In-Reply-To: <559672B7.4010802@gmail.com>
Just using the macro defined in nfs_idmap.h.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
fs/nfsd/idmap.h | 4 +---
fs/nfsd/nfs4idmap.c | 3 ---
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/fs/nfsd/idmap.h b/fs/nfsd/idmap.h
index a3f3490..23cc85d 100644
--- a/fs/nfsd/idmap.h
+++ b/fs/nfsd/idmap.h
@@ -37,9 +37,7 @@
#include <linux/in.h>
#include <linux/sunrpc/svc.h>
-
-/* XXX from linux/nfs_idmap.h */
-#define IDMAP_NAMESZ 128
+#include <linux/nfs_idmap.h>
#ifdef CONFIG_NFSD_V4
int nfsd_idmap_init(struct net *);
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index e1b3d3d..5b20577 100644
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -59,9 +59,6 @@ MODULE_PARM_DESC(nfs4_disable_idmapping,
* that.
*/
-#define IDMAP_TYPE_USER 0
-#define IDMAP_TYPE_GROUP 1
-
struct ent {
struct cache_head h;
int type; /* User / Group */
--
2.4.3
next prev parent reply other threads:[~2015-07-03 11:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-03 11:32 [PATCH 1/5] nfsd: Fix a file leak of ls_file if nfsd4_layout_setlease fail Kinglong Mee
2015-07-03 11:34 ` [PATCH 2/5] nfsd: Drop including client's header file nfs_fs.h Kinglong Mee
2015-07-03 11:36 ` Kinglong Mee [this message]
2015-07-03 11:38 ` [PATCH 4/5] nfsd: Check stateid generation in nfsd4_lookup_stateid() Kinglong Mee
2015-07-08 21:42 ` J. Bruce Fields
2015-07-09 10:51 ` Kinglong Mee
2015-07-03 11:39 ` [PATCH 5/5] nfsd: Add macro NFS_ACL_MASK for ACL Kinglong Mee
2015-07-08 21:45 ` J. Bruce Fields
2015-07-08 21:30 ` [PATCH 1/5] nfsd: Fix a file leak of ls_file if nfsd4_layout_setlease fail J. Bruce Fields
2015-07-09 8:12 ` Christoph Hellwig
2015-07-09 9:31 ` Kinglong Mee
2015-07-09 9:38 ` [PATCH v2] " Kinglong Mee
2015-07-09 16:19 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=559673AE.5020308@gmail.com \
--to=kinglongmee@gmail.com \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox