diff options
| author | Trond Myklebust | 2013-03-15 21:11:57 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2013-03-25 17:04:11 +0100 |
| commit | 39c6daae70fe7692fc2d28738c7ebd63f0318741 (patch) | |
| tree | 123246157abfaed0d4a61d5aeb3c8c6e2ffb7e65 /fs/nfs/nfs4proc.c | |
| parent | NFSv4: Resend the READ/WRITE RPC call if a stateid change causes an error (diff) | |
| download | kernel-qcow2-linux-39c6daae70fe7692fc2d28738c7ebd63f0318741.tar.gz kernel-qcow2-linux-39c6daae70fe7692fc2d28738c7ebd63f0318741.tar.xz kernel-qcow2-linux-39c6daae70fe7692fc2d28738c7ebd63f0318741.zip | |
NFSv4: Prepare for minorversion-specific nfs_server capabilities
Clean up the setting of the nfs_server->caps, by shoving it all
into nfs4_server_common_setup().
Then add an 'initial capabilities' field into struct nfs4_minor_version_ops.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6ad06121d88c..22c80f9ed824 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6823,6 +6823,10 @@ static const struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = { static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = { .minor_version = 0, + .init_caps = NFS_CAP_READDIRPLUS + | NFS_CAP_ATOMIC_OPEN + | NFS_CAP_CHANGE_ATTR + | NFS_CAP_POSIX_LOCK, .call_sync = _nfs4_call_sync, .match_stateid = nfs4_match_stateid, .find_root_sec = nfs4_find_root_sec, @@ -6834,6 +6838,10 @@ static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = { #if defined(CONFIG_NFS_V4_1) static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = { .minor_version = 1, + .init_caps = NFS_CAP_READDIRPLUS + | NFS_CAP_ATOMIC_OPEN + | NFS_CAP_CHANGE_ATTR + | NFS_CAP_POSIX_LOCK, .call_sync = nfs4_call_sync_sequence, .match_stateid = nfs41_match_stateid, .find_root_sec = nfs41_find_root_sec, |