2 files changed, 5 insertions, 1 deletions

diff --git a/drivers/staging/pohmelfs/lock.c b/drivers/staging/pohmelfs/lock.c
index ad4a18559bd..22fef18cae9 100644
--- a/drivers/staging/pohmelfs/lock.c
+++ b/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/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
index 168fc8998c3..fef5f9bd692 100644
--- a/drivers/staging/pohmelfs/trans.c
+++ b/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;