From 3b567b9dd0cc00139721699ac6a362970a0652fa Mon Sep 17 00:00:00 2001
From: Evgeniy Polyakov <zbr@ioremap.net>
Date: Fri, 27 Mar 2009 15:04:30 +0300
Subject: [PATCH] --- yaml --- r: 143663 b: refs/heads/master c:
 d43f3612818b13f44e12bfc2ad75b4b46628b3da h: refs/heads/master i:   143661:
 81818d134b20a1a96e5152f489a3daf057ddda44   143659:
 089c169aa339dcb295d6bffbedd0e54973746e11   143655:
 c3f5ca98e280133628e76a2e281cbad1b09ea881   143647:
 784ebd31a294447319aa3795d4f9f09c47fea06d v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/pohmelfs/lock.c  | 3 ++-
 trunk/drivers/staging/pohmelfs/trans.c | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index befab900516a..e80cf075f946 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0ca87391694dfacd01465d5c01c579c3b8b63e0
+refs/heads/master: d43f3612818b13f44e12bfc2ad75b4b46628b3da
diff --git a/trunk/drivers/staging/pohmelfs/lock.c b/trunk/drivers/staging/pohmelfs/lock.c
index ad4a18559bdd..22fef18cae90 100644
--- a/trunk/drivers/staging/pohmelfs/lock.c
+++ b/trunk/drivers/staging/pohmelfs/lock.c
@@ -41,7 +41,8 @@ static int pohmelfs_send_lock_trans(struct pohmelfs_inode *pi,
 	path_len = err;
 
 	err = -ENOMEM;
-	t = netfs_trans_alloc(psb, path_len + sizeof(struct netfs_lock) + isize, 0, 0);
+	t = netfs_trans_alloc(psb, path_len + sizeof(struct netfs_lock) + isize,
+			NETFS_TRANS_SINGLE_DST, 0);
 	if (!t)
 		goto err_out_exit;
 
diff --git a/trunk/drivers/staging/pohmelfs/trans.c b/trunk/drivers/staging/pohmelfs/trans.c
index 168fc8998c32..fef5f9bd6920 100644
--- a/trunk/drivers/staging/pohmelfs/trans.c
+++ b/trunk/drivers/staging/pohmelfs/trans.c
@@ -467,6 +467,9 @@ int netfs_trans_finish_send(struct netfs_trans *t, struct pohmelfs_sb *psb)
 				continue;
 		}
 
+		if (psb->active_state && (psb->active_state->state.ctl.prio >= st->ctl.prio))
+			st = &psb->active_state->state;
+
 		err = netfs_trans_push(t, st);
 		if (!err && (t->flags & NETFS_TRANS_SINGLE_DST))
 			break;