diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /fs/nfsd/nfs4recover.c | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'fs/nfsd/nfs4recover.c')
| -rw-r--r-- | fs/nfsd/nfs4recover.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index b5348405046b..5a754f7b71ed 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/fs/nfsd/nfs4recover.c | ||
| 3 | * | ||
| 4 | * Copyright (c) 2004 The Regents of the University of Michigan. | 2 | * Copyright (c) 2004 The Regents of the University of Michigan. |
| 5 | * All rights reserved. | 3 | * All rights reserved. |
| 6 | * | 4 | * |
| @@ -33,20 +31,14 @@ | |||
| 33 | * | 31 | * |
| 34 | */ | 32 | */ |
| 35 | 33 | ||
| 36 | #include <linux/err.h> | ||
| 37 | #include <linux/sunrpc/svc.h> | ||
| 38 | #include <linux/nfsd/nfsd.h> | ||
| 39 | #include <linux/nfs4.h> | ||
| 40 | #include <linux/nfsd/state.h> | ||
| 41 | #include <linux/nfsd/xdr4.h> | ||
| 42 | #include <linux/param.h> | ||
| 43 | #include <linux/file.h> | 34 | #include <linux/file.h> |
| 44 | #include <linux/namei.h> | 35 | #include <linux/namei.h> |
| 45 | #include <asm/uaccess.h> | ||
| 46 | #include <linux/scatterlist.h> | ||
| 47 | #include <linux/crypto.h> | 36 | #include <linux/crypto.h> |
| 48 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 49 | #include <linux/mount.h> | 38 | |
| 39 | #include "nfsd.h" | ||
| 40 | #include "state.h" | ||
| 41 | #include "vfs.h" | ||
| 50 | 42 | ||
| 51 | #define NFSDDBG_FACILITY NFSDDBG_PROC | 43 | #define NFSDDBG_FACILITY NFSDDBG_PROC |
| 52 | 44 | ||