---

yaml --- r: 320213 b: refs/heads/master c: 82c7c7a h: refs/heads/master i: 320211: bb9bfb2 v: v3
git-mirror · Jul 16, 2012 · f76a82f · f76a82f
1 parent 34e0a97
commit f76a82f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c
+refs/heads/master: 82c7c7a5a9270b13380a588dc57b7541a5e4f541
diff --git a/trunk/fs/nfs/nfs4filelayout.c b/trunk/fs/nfs/nfs4filelayout.c
@@ -205,9 +205,8 @@ static int filelayout_async_handle_error(struct rpc_task *task,
 	case -EPIPE:
 		dprintk("%s DS connection error %d\n", __func__,
 			task->tk_status);
-		if (!filelayout_test_devid_invalid(devid))
-			_pnfs_return_layout(inode);
 		filelayout_mark_devid_invalid(devid);
+		_pnfs_return_layout(inode);
 		rpc_wake_up(&tbl->slot_tbl_waitq);
 		nfs4_ds_disconnect(clp);
 		/* fall through */