On Mar. 29, 2009, 19:02 +0300, Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> wrote:
> On Tue, 2009-03-03 at 16:52 -0700, Benny Halevy wrote:
>> This field is set to the nfsv4 minor version for this mount.
>>
>> Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
>>
>> Note: This patch sets the referral to the same minorversion as the
>> current mount. Revisit in future patch.
>>
>> Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
>> [removed cl_minorversion assignment in nfs_set_client]
>> Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
>> ---
>> fs/nfs/client.c | 9 ++++++---
>> include/linux/nfs_fs_sb.h | 3 ++-
>> 2 files changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/fs/nfs/client.c b/fs/nfs/client.c
>> index 9b728f3..2555e48 100644
>> --- a/fs/nfs/client.c
>> +++ b/fs/nfs/client.c
>> @@ -1036,7 +1036,8 @@ static int nfs4_set_client(struct nfs_server
>> *server,
>> const size_t addrlen,
>> const char *ip_addr,
>> rpc_authflavor_t authflavour,
>> - int proto, const struct rpc_timeout *timeparms)
>> + int proto, const struct rpc_timeout *timeparms,
>> + u32 minorversion)
>> {
>> struct nfs_client_initdata cl_init = {
>> .hostname = hostname,
>> @@ -1098,7 +1099,8 @@ static int nfs4_init_server(struct nfs_server
>> *server,
>> data->client_address,
>> data->auth_flavors[0],
>> data->nfs_server.protocol,
>> - &timeparms);
>> + &timeparms,
>> + data->minorversion);
>
> This can't compile. There is no minor version field in the mount
> structure yet.
Right, sorry about that.
I revisited the patch series' bisectability and fixed it.
I'll resend it later today, if that's ok.
Benny
>
>> if (error < 0)
>> goto error;
>>
>> @@ -1216,7 +1218,8 @@ struct nfs_server
>> *nfs4_create_referral_server(struct nfs_clone_mount *data,
>> parent_client->cl_ipaddr,
>> data->authflavor,
>> parent_server->client->cl_xprt->prot,
>> - parent_server->client->cl_timeout);
>> + parent_server->client->cl_timeout,
>> + parent_client->cl_minorversion);
>> if (error < 0)
>> goto error;
>>
>> diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
>> index 9bb81ae..63f8b00 100644
>> --- a/include/linux/nfs_fs_sb.h
>> +++ b/include/linux/nfs_fs_sb.h
>> @@ -63,7 +63,8 @@ struct nfs_client {
>> */
>> char cl_ipaddr[48];
>> unsigned char cl_id_uniquifier;
>> -#endif
>> + u32 cl_minorversion;
>> +#endif /* CONFIG_NFS_V4 */
>> };
>>
>> /*
>> --
>> 1.6.1.3
>>
>>
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
