| Message ID | 1303459544-16518-1-git-send-email-bhalevy@panasas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index ec2418b..27b0593 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -714,11 +714,8 @@ _pnfs_return_layout(struct inode *ino) spin_unlock(&ino->i_lock); pnfs_free_lseg_list(&tmp_list); - /* Return layout even if layoutcommit fails */ - status = pnfs_layoutcommit_inode(ino, true); - if (status) - dprintk("%s: layoutcommit failed, status=%d. Returning layout anyway\n", - __func__, status); + WARN_ON(test_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags)); + status = return_layout(ino); out: dprintk("<-- %s status: %d\n", __func__, status);
squash into "pnfs: layoutreturn" Signed-off-by: Benny Halevy <bhalevy@panasas.com> --- fs/nfs/pnfs.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)