diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/nfsd/nfsxdr.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/nfsd/nfsxdr.c')
| -rw-r--r-- | fs/nfsd/nfsxdr.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c index afd08e2c90a5..4ce005dbf3e6 100644 --- a/fs/nfsd/nfsxdr.c +++ b/fs/nfsd/nfsxdr.c | |||
| @@ -1,20 +1,10 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/fs/nfsd/nfsxdr.c | ||
| 3 | * | ||
| 4 | * XDR support for nfsd | 2 | * XDR support for nfsd |
| 5 | * | 3 | * |
| 6 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | 4 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> |
| 7 | */ | 5 | */ |
| 8 | 6 | ||
| 9 | #include <linux/types.h> | 7 | #include "xdr.h" |
| 10 | #include <linux/time.h> | ||
| 11 | #include <linux/nfs.h> | ||
| 12 | #include <linux/vfs.h> | ||
| 13 | #include <linux/sunrpc/xdr.h> | ||
| 14 | #include <linux/sunrpc/svc.h> | ||
| 15 | #include <linux/nfsd/nfsd.h> | ||
| 16 | #include <linux/nfsd/xdr.h> | ||
| 17 | #include <linux/mm.h> | ||
| 18 | #include "auth.h" | 8 | #include "auth.h" |
| 19 | 9 | ||
| 20 | #define NFSDDBG_FACILITY NFSDDBG_XDR | 10 | #define NFSDDBG_FACILITY NFSDDBG_XDR |