Subject: [merged] ocfs2-flock-drop-cross-node-lock-when-failed-locally.patch removed from -mm tree
To: wen.gang.wang@xxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 12:30:32 -0700
The patch titled
Subject: ocfs2: flock: drop cross-node lock when failed locally
has been removed from the -mm tree. Its filename was
ocfs2-flock-drop-cross-node-lock-when-failed-locally.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Wengang Wang <wen.gang.wang@xxxxxxxxxx>
Subject: ocfs2: flock: drop cross-node lock when failed locally
ocfs2_do_flock() calls ocfs2_file_lock() to get the cross-node clock and
then call flock_lock_file_wait() to compete with local processes. In case
flock_lock_file_wait() failed, say -ENOMEM, clean up work is not done.
This patch adds the cleanup --drop the cross-node lock which was just
granted.
[akpm@xxxxxxxxxxxxxxxxxxxx: coding-style fixes]
Signed-off-by: Wengang Wang <wen.gang.wang@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Reviewed-by: Mark Fasheh <mfasheh@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/locks.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN fs/ocfs2/locks.c~ocfs2-flock-drop-cross-node-lock-when-failed-locally fs/ocfs2/locks.c
--- a/fs/ocfs2/locks.c~ocfs2-flock-drop-cross-node-lock-when-failed-locally
+++ a/fs/ocfs2/locks.c
@@ -82,6 +82,8 @@ static int ocfs2_do_flock(struct file *f
}
ret = flock_lock_file_wait(file, fl);
+ if (ret)
+ ocfs2_file_unlock(file);
out:
mutex_unlock(&fp->fp_mutex);
_
Patches currently in -mm which might be from wen.gang.wang@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
