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/auth.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/nfsd/auth.c')
| -rw-r--r-- | fs/nfsd/auth.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/nfsd/auth.c b/fs/nfsd/auth.c index 36fcabbf5186..79717a40daba 100644 --- a/fs/nfsd/auth.c +++ b/fs/nfsd/auth.c | |||
| @@ -1,15 +1,7 @@ | |||
| 1 | /* | 1 | /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */ |
| 2 | * linux/fs/nfsd/auth.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> | ||
| 5 | */ | ||
| 6 | 2 | ||
| 7 | #include <linux/types.h> | ||
| 8 | #include <linux/sched.h> | 3 | #include <linux/sched.h> |
| 9 | #include <linux/sunrpc/svc.h> | 4 | #include "nfsd.h" |
| 10 | #include <linux/sunrpc/svcauth.h> | ||
| 11 | #include <linux/nfsd/nfsd.h> | ||
| 12 | #include <linux/nfsd/export.h> | ||
| 13 | #include "auth.h" | 5 | #include "auth.h" |
| 14 | 6 | ||
| 15 | int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp) | 7 | int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp) |