On Sep 15, 2010, at 12:45 PM, Trond Myklebust wrote:
> On Wed, 2010-09-15 at 11:26 -0400, Chuck Lever wrote:
>> On Sep 15, 2010, at 9:23 AM, Jeff Layton wrote:
>>
>>> Add the missing fields to nfs_renameargs and drop nfs4_rename_arg
>>>
>>> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
>>> ---
>>> fs/nfs/nfs4proc.c | 2 +-
>>> fs/nfs/nfs4xdr.c | 2 +-
>>> include/linux/nfs_xdr.h | 19 ++++++-------------
>>> 3 files changed, 8 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
>>> index 089da5b..eb36784 100644
>>> --- a/fs/nfs/nfs4proc.c
>>> +++ b/fs/nfs/nfs4proc.c
>>> @@ -2675,7 +2675,7 @@ static int _nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
>>> struct inode *new_dir, struct qstr *new_name)
>>> {
>>> struct nfs_server *server = NFS_SERVER(old_dir);
>>> - struct nfs4_rename_arg arg = {
>>> + struct nfs_renameargs arg = {
>>> .old_dir = NFS_FH(old_dir),
>>> .new_dir = NFS_FH(new_dir),
>>> .old_name = old_name,
>>> diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
>>> index 08ef912..7a098ae 100644
>>> --- a/fs/nfs/nfs4xdr.c
>>> +++ b/fs/nfs/nfs4xdr.c
>>> @@ -1823,7 +1823,7 @@ static int nfs4_xdr_enc_remove(struct rpc_rqst *req, __be32 *p, const struct nfs
>>> /*
>>> * Encode RENAME request
>>> */
>>> -static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs4_rename_arg *args)
>>> +static int nfs4_xdr_enc_rename(struct rpc_rqst *req, __be32 *p, const struct nfs_renameargs *args)
>>> {
>>> struct xdr_stream xdr;
>>> struct compound_hdr hdr = {
>>> diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
>>> index 5436680..60fa509 100644
>>> --- a/include/linux/nfs_xdr.h
>>> +++ b/include/linux/nfs_xdr.h
>>> @@ -403,10 +403,12 @@ struct nfs_removeres {
>>> * Common arguments to the rename call
>>> */
>>> struct nfs_renameargs {
>>> - const struct nfs_fh * old_dir;
>>> - const struct nfs_fh * new_dir;
>>> - const struct qstr * old_name;
>>> - const struct qstr * new_name;
>>> + const struct nfs_fh * old_dir;
>>> + const struct nfs_fh * new_dir;
>>> + const struct qstr * old_name;
>>> + const struct qstr * new_name;
>>> + const u32 * bitmask;
>>> + struct nfs4_sequence_args seq_args;
>>
>> Should these new fields be gated by CONFIG_NFS_V4 ?
>
> No. Please don't add any more #ifdef CONFIG_NFS_V4 sections: that just
> adds to the testing duties. The job now is to get rid of
> CONFIG_NFS_V..., not to add more to it.
The underlying question was whether this builds when CONFIG_NFS_V4 is disabled, and Jeff has confirmed that it does. Agreed that no change is needed here.
--
chuck[dot]lever[at]oracle[dot]com
--
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
