diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 21:13:00 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-18 21:13:44 -0400 |
| commit | 1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81 (patch) | |
| tree | 143956f878290e85de7c9130f465e862f587ee53 /include/linux/nfs2.h | |
| parent | 301933a0acfdec837fd8b4884093b3f0fff01d8a (diff) | |
| parent | 4bf259e3ae5015e73282ba66716c4a917e1264ac (diff) | |
Merge branch 'devel-for-2.6.31' into for-2.6.31
Conflicts:
fs/nfs/client.c
fs/nfs/super.c
Diffstat (limited to 'include/linux/nfs2.h')
| -rw-r--r-- | include/linux/nfs2.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/nfs2.h b/include/linux/nfs2.h index 0ed9517138fc..fde24b30cc9e 100644 --- a/include/linux/nfs2.h +++ b/include/linux/nfs2.h | |||
| @@ -64,11 +64,4 @@ struct nfs2_fh { | |||
| 64 | #define NFSPROC_READDIR 16 | 64 | #define NFSPROC_READDIR 16 |
| 65 | #define NFSPROC_STATFS 17 | 65 | #define NFSPROC_STATFS 17 |
| 66 | 66 | ||
| 67 | #define NFS_MNT_PROGRAM 100005 | ||
| 68 | #define NFS_MNT_VERSION 1 | ||
| 69 | #define MNTPROC_NULL 0 | ||
| 70 | #define MNTPROC_MNT 1 | ||
| 71 | #define MNTPROC_UMNT 3 | ||
| 72 | #define MNTPROC_UMNTALL 4 | ||
| 73 | |||
| 74 | #endif /* _LINUX_NFS2_H */ | 67 | #endif /* _LINUX_NFS2_H */ |