git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
1aead65
..
7ec121c
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-293,8
+293,6
@@
static int flock_make_lock(struct file *filp, struct file_lock **lock,
fl->fl_type = type;
fl->fl_end = OFFSET_MAX;
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);
fl->fl_xid = filp->f_xid;
vx_locks_inc(fl);
@@
-483,9
+481,6
@@
static int lease_alloc(struct file *filp, int type, struct file_lock **flp)
goto out;
fl->fl_xid = vx_current_xid();
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) {
vx_locks_inc(fl);
error = lease_init(filp, type, fl);
if (error) {
@@
-819,8
+814,6
@@
static int __posix_lock_file_conf(struct inode *inode, struct file_lock *request
struct file_lock **before;
int error, added = 0;
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.
/*
* 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 file *filp, unsigned int cmd,
if (file_lock == NULL)
return -ENOLCK;
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);
file_lock->fl_xid = filp->f_xid;
vx_locks_inc(file_lock);
@@
-1826,8
+1817,6
@@
int fcntl_setlk64(unsigned int fd, struct file *filp, unsigned int cmd,
if (file_lock == NULL)
return -ENOLCK;
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);
file_lock->fl_xid = filp->f_xid;
vx_locks_inc(file_lock);