--- linux-2.6.17.7-vs2.0.2-rc28/fs/locks.c	2006-07-12 14:13:21 +0200
+++ linux-2.6.17.7-vs2.0.2-rc28x/fs/locks.c	2006-08-14 22:34:17 +0200
@@ -293,8 +293,6 @@ static int flock_make_lock(struct file *
 	fl->fl_type = type;
 	fl->fl_end = OFFSET_MAX;
 
-	vxd_assert(filp->f_xid == vx_current_xid(),
-		"f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
 	fl->fl_xid = filp->f_xid;
 	vx_locks_inc(fl);
 	
@@ -483,9 +481,6 @@ static int lease_alloc(struct file *filp
 		goto out;
 
 	fl->fl_xid = vx_current_xid();
-	if (filp)
-		vxd_assert(filp->f_xid == fl->fl_xid,
-			"f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid);
 	vx_locks_inc(fl);
 	error = lease_init(filp, type, fl);
 	if (error) {
@@ -819,8 +814,6 @@ static int __posix_lock_file_conf(struct
 	struct file_lock **before;
 	int error, added = 0;
 
-	vxd_assert(xid == vx_current_xid(),
-		"xid(%d) == current(%d)", xid, vx_current_xid());
 	/*
 	 * We may need two file_lock structures for this operation,
 	 * so we get them in advance to avoid races.
@@ -1678,8 +1671,6 @@ int fcntl_setlk(unsigned int fd, struct 
 	if (file_lock == NULL)
 		return -ENOLCK;
 
-	vxd_assert(filp->f_xid == vx_current_xid(),
-		"f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
 	file_lock->fl_xid = filp->f_xid;
 	vx_locks_inc(file_lock);
 
@@ -1826,8 +1817,6 @@ int fcntl_setlk64(unsigned int fd, struc
 	if (file_lock == NULL)
 		return -ENOLCK;
 
-	vxd_assert(filp->f_xid == vx_current_xid(),
-		"f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid());
 	file_lock->fl_xid = filp->f_xid;
 	vx_locks_inc(file_lock);