Skip to contentSkip to conversation

Patch "pNFS/flexfiles: Fix layoutcommit after a commit to DS" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 5, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

pNFS/flexfiles: Fix layoutcommit after a commit to DS

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
pnfs-flexfiles-fix-layoutcommit-after-a-commit-to-ds.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c001c87a63aa2f35358e33eb05e45e4cbcb34f54 Mon Sep 17 00:00:00 2001

From: Trond Myklebust <[email protected]>
Date: Sun, 26 Jun 2016 12:39:49 -0400
Subject: pNFS/flexfiles: Fix layoutcommit after a commit to DS

From: Trond Myklebust <[email protected]>

commit c001c87a63aa2f35358e33eb05e45e4cbcb34f54 upstream.

We should always do a layoutcommit after commit to DS, except if the layout segment we're using has set FF_FLAGS_NO_LAYOUTCOMMIT.

Fixes d67ae825a59d ("pnfs/flexfiles: Add the FlexFile Layout Driver")
---
 fs/nfs/flexfilelayout/flexfilelayout.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +1 -2
@@ -1414,8 +1414,7 @@ static int ff_layout_commit_done_cb(stru
 		return -EAGAIN;
 	}
 
-	if (data->verf.committed == NFS_UNSTABLE
-	    && ff_layout_need_layoutcommit(data->lseg))
+	if (ff_layout_need_layoutcommit(data->lseg))
 		pnfs_set_layoutcommit(data->inode, data->lseg, data->lwb);
 
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/pnfs-flexfiles-fix-layoutcommit-after-a-commit-to-ds.patch queue-4.4/pnfs-files-fix-layoutcommit-after-a-commit-to-ds.patch