* [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd
@ 2007-11-15 22:53 J. Bruce Fields
2007-11-15 22:53 ` [PATCH 2/2] nfsd: minor fs/nfsd/auth.h cleanup J. Bruce Fields
2007-11-16 0:31 ` [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd Neil Brown
0 siblings, 2 replies; 6+ messages in thread
From: J. Bruce Fields @ 2007-11-15 22:53 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-nfs, Robert P. J. Day, nfs, J. Bruce Fields
This header is used only in a few places in fs/nfsd, so there seems to
be little point to having it in include/. (Thanks to Robert Day for
pointing this out.)
Cc: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
fs/nfsd/auth.h | 27 +++++++++++++++++++++++++++
fs/nfsd/nfs3xdr.c | 1 +
fs/nfsd/nfsfh.c | 1 +
fs/nfsd/nfsxdr.c | 1 +
include/linux/nfsd/Kbuild | 1 -
include/linux/nfsd/auth.h | 27 ---------------------------
include/linux/nfsd/nfsd.h | 1 -
include/linux/nfsd/syscall.h | 1 -
8 files changed, 30 insertions(+), 30 deletions(-)
create mode 100644 fs/nfsd/auth.h
delete mode 100644 include/linux/nfsd/auth.h
diff --git a/fs/nfsd/auth.h b/fs/nfsd/auth.h
new file mode 100644
index 0000000..0fb9f72
--- /dev/null
+++ b/fs/nfsd/auth.h
@@ -0,0 +1,27 @@
+/*
+ * include/linux/nfsd/auth.h
+ *
+ * nfsd-specific authentication stuff.
+ * uid/gid mapping not yet implemented.
+ *
+ * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
+ */
+
+#ifndef LINUX_NFSD_AUTH_H
+#define LINUX_NFSD_AUTH_H
+
+#ifdef __KERNEL__
+
+#define nfsd_luid(rq, uid) ((u32)(uid))
+#define nfsd_lgid(rq, gid) ((u32)(gid))
+#define nfsd_ruid(rq, uid) ((u32)(uid))
+#define nfsd_rgid(rq, gid) ((u32)(gid))
+
+/*
+ * Set the current process's fsuid/fsgid etc to those of the NFS
+ * client user
+ */
+int nfsd_setuser(struct svc_rqst *, struct svc_export *);
+
+#endif /* __KERNEL__ */
+#endif /* LINUX_NFSD_AUTH_H */
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 9aefa95..1fd897d 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -21,6 +21,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr3.h>
+#include "auth.h"
#define NFSDDBG_FACILITY NFSDDBG_XDR
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 468f17a..8fbd2dc 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -22,6 +22,7 @@
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/svcauth_gss.h>
#include <linux/nfsd/nfsd.h>
+#include "auth.h"
#define NFSDDBG_FACILITY NFSDDBG_FH
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 1c16885..383d6d2 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -15,6 +15,7 @@
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/xdr.h>
#include <linux/mm.h>
+#include "auth.h"
#define NFSDDBG_FACILITY NFSDDBG_XDR
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
index d9c5455..e726fc3 100644
--- a/include/linux/nfsd/Kbuild
+++ b/include/linux/nfsd/Kbuild
@@ -4,4 +4,3 @@ unifdef-y += stats.h
unifdef-y += syscall.h
unifdef-y += nfsfh.h
unifdef-y += debug.h
-unifdef-y += auth.h
diff --git a/include/linux/nfsd/auth.h b/include/linux/nfsd/auth.h
deleted file mode 100644
index 0fb9f72..0000000
--- a/include/linux/nfsd/auth.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * include/linux/nfsd/auth.h
- *
- * nfsd-specific authentication stuff.
- * uid/gid mapping not yet implemented.
- *
- * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
- */
-
-#ifndef LINUX_NFSD_AUTH_H
-#define LINUX_NFSD_AUTH_H
-
-#ifdef __KERNEL__
-
-#define nfsd_luid(rq, uid) ((u32)(uid))
-#define nfsd_lgid(rq, gid) ((u32)(gid))
-#define nfsd_ruid(rq, uid) ((u32)(uid))
-#define nfsd_rgid(rq, gid) ((u32)(gid))
-
-/*
- * Set the current process's fsuid/fsgid etc to those of the NFS
- * client user
- */
-int nfsd_setuser(struct svc_rqst *, struct svc_export *);
-
-#endif /* __KERNEL__ */
-#endif /* LINUX_NFSD_AUTH_H */
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index a51a30f..8caf4c4 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -20,7 +20,6 @@
#include <linux/nfsd/debug.h>
#include <linux/nfsd/nfsfh.h>
#include <linux/nfsd/export.h>
-#include <linux/nfsd/auth.h>
#include <linux/nfsd/stats.h>
/*
* nfsd version
diff --git a/include/linux/nfsd/syscall.h b/include/linux/nfsd/syscall.h
index 8bcddcc..4e43976 100644
--- a/include/linux/nfsd/syscall.h
+++ b/include/linux/nfsd/syscall.h
@@ -18,7 +18,6 @@
#include <linux/nfsd/const.h>
#include <linux/nfsd/export.h>
#include <linux/nfsd/nfsfh.h>
-#include <linux/nfsd/auth.h>
/*
* Version of the syscall interface
--
1.5.3.5.561.g140d
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] nfsd: minor fs/nfsd/auth.h cleanup
2007-11-15 22:53 [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd J. Bruce Fields
@ 2007-11-15 22:53 ` J. Bruce Fields
2007-11-16 0:31 ` [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd Neil Brown
1 sibling, 0 replies; 6+ messages in thread
From: J. Bruce Fields @ 2007-11-15 22:53 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-nfs, nfs, J. Bruce Fields
While we're here, let's remove the redundant (and now wrong) pathname in
the comment, and the #ifdef __KERNEL__'s.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
fs/nfsd/auth.h | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/auth.h b/fs/nfsd/auth.h
index 0fb9f72..78b3c0e 100644
--- a/fs/nfsd/auth.h
+++ b/fs/nfsd/auth.h
@@ -1,6 +1,4 @@
/*
- * include/linux/nfsd/auth.h
- *
* nfsd-specific authentication stuff.
* uid/gid mapping not yet implemented.
*
@@ -10,8 +8,6 @@
#ifndef LINUX_NFSD_AUTH_H
#define LINUX_NFSD_AUTH_H
-#ifdef __KERNEL__
-
#define nfsd_luid(rq, uid) ((u32)(uid))
#define nfsd_lgid(rq, gid) ((u32)(gid))
#define nfsd_ruid(rq, uid) ((u32)(uid))
@@ -23,5 +19,4 @@
*/
int nfsd_setuser(struct svc_rqst *, struct svc_export *);
-#endif /* __KERNEL__ */
#endif /* LINUX_NFSD_AUTH_H */
--
1.5.3.5.561.g140d
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd
2007-11-15 22:53 [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd J. Bruce Fields
2007-11-15 22:53 ` [PATCH 2/2] nfsd: minor fs/nfsd/auth.h cleanup J. Bruce Fields
@ 2007-11-16 0:31 ` Neil Brown
2007-11-16 3:32 ` J. Bruce Fields
2007-11-16 9:15 ` Robert P. J. Day
1 sibling, 2 replies; 6+ messages in thread
From: Neil Brown @ 2007-11-16 0:31 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: linux-nfs, Robert P. J. Day, nfs
On Thursday November 15, bfields@citi.umich.edu wrote:
> This header is used only in a few places in fs/nfsd, so there seems to
> be little point to having it in include/. (Thanks to Robert Day for
> pointing this out.)
>
> Cc: Robert P. J. Day <rpjday@crashcourse.ca>
> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Yes, good.
Acked-by: NeilBrown <neilb@suse.de>
But it does beg the question: what other include files could/should be
moved?
cache.h and xdr*.h all seem like good candidates.
Is it worth doing?
NeilBrown
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd
2007-11-16 0:31 ` [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd Neil Brown
@ 2007-11-16 3:32 ` J. Bruce Fields
2007-11-16 3:51 ` J. Bruce Fields
2007-11-16 9:15 ` Robert P. J. Day
1 sibling, 1 reply; 6+ messages in thread
From: J. Bruce Fields @ 2007-11-16 3:32 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-nfs, Robert P. J. Day, nfs
On Fri, Nov 16, 2007 at 11:31:05AM +1100, Neil Brown wrote:
> On Thursday November 15, bfields@citi.umich.edu wrote:
> > This header is used only in a few places in fs/nfsd, so there seems to
> > be little point to having it in include/. (Thanks to Robert Day for
> > pointing this out.)
> >
> > Cc: Robert P. J. Day <rpjday@crashcourse.ca>
> > Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
>
>
> Yes, good.
>
> Acked-by: NeilBrown <neilb@suse.de>
>
> But it does beg the question: what other include files could/should be
> moved?
> cache.h and xdr*.h all seem like good candidates.
Yup.
> Is it worth doing?
I think I'll leave it alone for now....
--b.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd
2007-11-16 3:32 ` J. Bruce Fields
@ 2007-11-16 3:51 ` J. Bruce Fields
0 siblings, 0 replies; 6+ messages in thread
From: J. Bruce Fields @ 2007-11-16 3:51 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-nfs, Robert P. J. Day, nfs
On Thu, Nov 15, 2007 at 10:32:41PM -0500, bfields wrote:
> Yup.
>
> > Is it worth doing?
>
> I think I'll leave it alone for now....
But I've added it to the "To do" list at
http://wiki.linux-nfs.org/wiki/index.php/To_do
--b.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd
2007-11-16 0:31 ` [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd Neil Brown
2007-11-16 3:32 ` J. Bruce Fields
@ 2007-11-16 9:15 ` Robert P. J. Day
1 sibling, 0 replies; 6+ messages in thread
From: Robert P. J. Day @ 2007-11-16 9:15 UTC (permalink / raw)
To: Neil Brown; +Cc: J. Bruce Fields, nfs, linux-nfs
On Fri, 16 Nov 2007, Neil Brown wrote:
> On Thursday November 15, bfields@citi.umich.edu wrote:
> > This header is used only in a few places in fs/nfsd, so there seems to
> > be little point to having it in include/. (Thanks to Robert Day for
> > pointing this out.)
> >
> > Cc: Robert P. J. Day <rpjday@crashcourse.ca>
> > Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
>
>
> Yes, good.
and i'm sure i don't need to point this out but, if you move headers
out from under include/linux, make sure you delete their references
from the Kbuild files as well.
rday
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://crashcourse.ca
========================================================================
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
_______________________________________________
Please note that nfs@lists.sourceforge.net is being discontinued.
Please subscribe to linux-nfs@vger.kernel.org instead.
http://vger.kernel.org/vger-lists.html#linux-nfs
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-11-16 9:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-15 22:53 [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd J. Bruce Fields
2007-11-15 22:53 ` [PATCH 2/2] nfsd: minor fs/nfsd/auth.h cleanup J. Bruce Fields
2007-11-16 0:31 ` [PATCH 1/2] nfsd: move nfsd/auth.h into fs/nfsd Neil Brown
2007-11-16 3:32 ` J. Bruce Fields
2007-11-16 3:51 ` J. Bruce Fields
2007-11-16 9:15 ` Robert P. J. Day
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).