On Fri, Feb 4, 2011 at 4:44 PM, Fred Isaman <iisaman@xxxxxxxxxx> wrote:
> On Fri, Feb 4, 2011 at 4:33 PM, <andros@xxxxxxxxxx> wrote:
>> From: Andy Adamson <andros@xxxxxxxxxx>
>>
>> Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
>> ---
>> fs/nfs/nfs4filelayout.c | 19 ++-----------------
>> 1 files changed, 2 insertions(+), 17 deletions(-)
>>
>> diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
>> index 3daf351..dce90a0 100644
>> --- a/fs/nfs/nfs4filelayout.c
>> +++ b/fs/nfs/nfs4filelayout.c
>> @@ -132,14 +132,6 @@ struct rpc_call_ops filelayout_read_call_ops = {
>> .rpc_release = filelayout_read_release,
>> };
>>
>> -/* Perform sync or async reads.
>> - *
>> - * An optimization for the NFS file layout driver
>> - * allows the original read/write data structs to be passed in the
>> - * last argument.
>> - *
>> - * TODO: join with write_pagelist?
>> - */
>> static enum pnfs_try_status
>> filelayout_read_pagelist(struct nfs_read_data *data, unsigned nr_pages)
>> {
>> @@ -149,8 +141,8 @@ filelayout_read_pagelist(struct nfs_read_data *data, unsigned nr_pages)
>> u32 idx;
>> struct nfs_fh *fh;
>>
>> - dprintk("--> %s ino %lu nr_pages %d pgbase %u req %Zu@%llu\n",
>> - __func__, data->inode->i_ino, nr_pages,
>> + dprintk("--> %s ino %lu pgbase %u req %Zu@%llu\n",
>> + __func__, data->inode->i_ino,
>> data->args.pgbase, (size_t)data->args.count, offset);
>>
>
> A nit, but this belongs in the next patch.
Yep :)
>
> Fred
>
>> /* Retrieve the correct rpc_client for the byte range */
>> @@ -169,13 +161,6 @@ filelayout_read_pagelist(struct nfs_read_data *data, unsigned nr_pages)
>> if (fh)
>> data->args.fh = fh;
>>
>> - /*
>> - * Now get the file offset on the dserver
>> - * Set the read offset to this offset, and
>> - * save the original offset in orig_offset
>> - * In the case of aync reads, the offset will be reset in the
>> - * call_ops->rpc_call_done() routine.
>> - */
>> data->args.offset = filelayout_get_dserver_offset(lseg, offset);
>> data->fldata.orig_offset = offset;
>>
>> --
>> 1.6.6
>>
>> --
>> 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
>>
> --
> 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
>
--
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
