[3/3] locks: Drop support for per-pid images with locks

Submitted by Pavel Emelianov on June 16, 2016, 2:50 p.m.

Details

Message ID 5762BCBA.2060308@virtuozzo.com
State Accepted
Series "Deprecation set"
Commit d3033bebc20b8bf1ce86000e20efd33c5b7635e6
Headers show

Commit Message

Pavel Emelianov June 16, 2016, 2:50 p.m.
This was 1.2 when we merged all file-locks images together. I think it is
good time to drop the legacy format.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/file-lock.c | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/file-lock.c b/criu/file-lock.c
index eb1feab..e08eda7 100644
--- a/criu/file-lock.c
+++ b/criu/file-lock.c
@@ -339,39 +339,16 @@  static int restore_file_locks(int pid)
 	return ret;
 }
 
-static int restore_file_locks_legacy(int pid)
-{
-	int ret = -1;
-	struct cr_img *img;
-	FileLockEntry *fle;
-
-	img = open_image(CR_FD_FILE_LOCKS_PID, O_RSTR, pid);
-	if (!img)
-		return -1;
-
-	while (1) {
-		ret = pb_read_one_eof(img, &fle, PB_FILE_LOCK);
-		if (ret <= 0)
-			break;
-
-		ret = restore_file_lock(fle);
-		file_lock_entry__free_unpacked(fle, NULL);
-		if (ret)
-			break;
-	}
-
-	close_image(img);
-	return ret;
-}
-
 int prepare_file_locks(int pid)
 {
 	if (!opts.handle_file_locks)
 		return 0;
 
-	pr_info("Restore file locks.\n");
-	if (file_locks_cinfo.flags & COLLECT_HAPPENED)
-		return restore_file_locks(pid);
+	if (!(file_locks_cinfo.flags & COLLECT_HAPPENED)) {
+		pr_warn("Per-pid file locks are deprecated\n");
+		return -1;
+	}
+
+	return restore_file_locks(pid);
 
-	return restore_file_locks_legacy(pid);
 }