From: Peng Tao <tao.peng@primarydata.com>
Date: Fri, 5 Sep 2014 16:53:29 +0000 (+0800)
Subject: nfs/filelayout: use pnfs_error_mark_layout_for_return
X-Git-Tag: fixes-v4.0-rc1~136^2~27^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c220106fb45909719295474e2497ffe03e47dfb3;p=pandora-kernel.git

nfs/filelayout: use pnfs_error_mark_layout_for_return

Instead of calling layoutreturn directly, call pnfs_error_mark_layout_for_return
to mark layouts for return and let generic code return layout when
layout segments are freed.

Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>

Conflicts:
	fs/nfs/filelayout/filelayout.c
---

Reading git-diff-tree failed