All of lore.kernel.org
 help / color / mirror / Atom feed
From: andros@netapp.com
To: bhalevy@panasas.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH 10/17] SQUASHME just return ds in nfs4_fl_prepare_ds
Date: Thu, 10 Feb 2011 20:52:43 -0500	[thread overview]
Message-ID: <1297389170-26702-11-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1297389170-26702-10-git-send-email-andros@netapp.com>

From: Andy Adamson <andros@netapp.com>

squash into: pnfs_submit: filelayout i/o helpers

Signed-off-by: Andy Adamson <andros@netapp.com>
---
 fs/nfs/nfs4filelayoutdev.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index 673e31e..6a7de00 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -599,5 +599,5 @@ nfs4_fl_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx)
 			return NULL;
 		}
 	}
-	return dsaddr->ds_list[ds_idx];
+	return ds;
 }
-- 
1.6.6


  reply	other threads:[~2011-02-11 18:00 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-11  1:52 [PATCH 0/17] pnfs-submit-wave3-rev3 bug fixes and cleanup andros
2011-02-11  1:52 ` [PATCH 01/17] SQUASHME pnfs-submit wave3 fix nfs4_ds_connect bug andros
2011-02-11  1:52   ` [PATCH 02/17] SQUASHME fix filelayout_set_lo_fail logic andros
2011-02-11  1:52     ` [PATCH 03/17] SQUASHME rename orig_offset to mds_offset andros
2011-02-11  1:52       ` [PATCH 04/17] SQUASHME rename nfs_read_data call_ops ONE andros
2011-02-11  1:52         ` [PATCH 05/17] SQUASHME rename nfs_read_data call_ops TWO andros
2011-02-11  1:52           ` [PATCH 06/17] SQUASHME rename nfs_read_data call_ops THREE andros
2011-02-11  1:52             ` [PATCH 07/17] SQUASHME remove reset mds_offset from filelayout_rpc_call_done andros
2011-02-11  1:52               ` [PATCH 08/17] SQUASHME reset offset to mds_offset andros
2011-02-11  1:52                 ` [PATCH 09/17] SQUASHME cleanup read_pagelist declaration and comment andros
2011-02-11  1:52                   ` andros [this message]
2011-02-11  1:52                     ` [PATCH 11/17] SQUASHME update pnfs_try_to_read_data comment andros
2011-02-11  1:52                       ` [PATCH 12/17] SQUASHME remove filelayout_async_handle_error comment andros
2011-02-11  1:52                         ` [PATCH 13/17] SQUASHME update nfs4_ds_connect comment andros
2011-02-11  1:52                           ` [PATCH 14/17] SQUASHME don't remove space andros
2011-02-11  1:52                             ` [PATCH 15/17] SQUASHME set non V41 pg_test to NULL andros
2011-02-11  1:52                               ` [PATCH 16/17] SQUASHME restore lost put_lseg code andros
2011-02-11  1:52                                 ` [PATCH 17/17] SQUASHME put_layout_hdr can remove nfsi->layout andros
2011-02-13  5:17 ` [PATCH 0/17] pnfs-submit-wave3-rev3 bug fixes and cleanup Benny Halevy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1297389170-26702-11-git-send-email-andros@netapp.com \
    --to=andros@netapp.com \
    --cc=bhalevy@panasas.com \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.