[CRIU] Error while dumping filelocks

[Pavel Emelyanov]

On 01/23/2015 12:17 PM, beproject criu wrote:
> Hi,
> I am trying to dump a lxc container using the below command
> 
> #criu dump --root /usr/local/lib/lxc/rootfs/root --evasive-devices \
> --tcp-established --ext-mount-map /dev:dev --file-locks -n net -n mnt \
> -n ipc -n pid -vvvvvvvv -D dump -o dump.log -t 79
> 
> But I get an error as follows :
> Error (file-lock.c:99): Unresolved lock found pid 683 ino 7378
> 
> What could be the reason for this?

It looks like the devices comparison when dumping file locks is
broken again.

Can you apply the below patch to CRIU and check again?

diff --git a/file-lock.c b/file-lock.c
index 210e67c..cfaa6f1 100644
--- a/file-lock.c
+++ b/file-lock.c
@@ -168,6 +168,7 @@ static inline int lock_file_match(pid_t pid, int fd, struct file_lock *fl, struc
 			return lock_btrfs_file_match(pid, fd, fl, p);
 	}
 
+	pr_info("Check lock %x vs %Lx (%x:%x)\n", (unsigned int)dev, makedev(fl->maj, fl->min), fl->maj, fl->min);
 	return makedev(fl->maj, fl->min) == dev;
 }