diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 18:13:00 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-18 18:13:44 -0700 |
| commit | 1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81 (patch) | |
| tree | 143956f878290e85de7c9130f465e862f587ee53 /fs/nfs/internal.h | |
| parent | 301933a0acfdec837fd8b4884093b3f0fff01d8a (diff) | |
| parent | 4bf259e3ae5015e73282ba66716c4a917e1264ac (diff) | |
| download | kernel_goldelico_gta04-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.zip kernel_goldelico_gta04-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.tar.gz kernel_goldelico_gta04-1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81.tar.bz2 | |
Merge branch 'devel-for-2.6.31' into for-2.6.31
Conflicts:
fs/nfs/client.c
fs/nfs/super.c
Diffstat (limited to 'fs/nfs/internal.h')
| -rw-r--r-- | fs/nfs/internal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index acee327..7dd90a6 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -43,6 +43,12 @@ struct nfs_clone_mount { }; /* + * Note: RFC 1813 doesn't limit the number of auth flavors that + * a server can return, so make something up. + */ +#define NFS_MAX_SECFLAVORS (12) + +/* * In-kernel mount arguments */ struct nfs_parsed_mount_data { @@ -91,6 +97,8 @@ struct nfs_mount_request { unsigned short protocol; struct nfs_fh *fh; int noresvport; + unsigned int *auth_flav_len; + rpc_authflavor_t *auth_flavs; }; extern int nfs_mount(struct nfs_mount_request *info); |