summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/compat/linux/linux_file.c5
-rw-r--r--sys/compat/linux/linux_misc.c4
-rw-r--r--sys/i386/linux/linux_file.c5
-rw-r--r--sys/i386/linux/linux_misc.c4
4 files changed, 8 insertions, 10 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 9fe4d40a1633..addfbefe46e9 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -462,8 +462,7 @@ again:
auio.uio_resid = buflen;
auio.uio_offset = off - (off_t)blockoff;
- error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, (int *) NULL,
- (u_int **) NULL);
+ error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, NULL);
if (error) {
goto out;
}
@@ -530,7 +529,7 @@ again:
eof:
*retval = nbytes - resid;
out:
- VOP_UNLOCK(vp, p);
+ VOP_UNLOCK(vp, 0, p);
free(buf, M_TEMP);
return error;
}
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index d0332cf5cd4a..7e99f0290556 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -237,7 +237,7 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval)
/*
* Lock no longer needed
*/
- VOP_UNLOCK(vp, p);
+ VOP_UNLOCK(vp, 0, p);
locked = 0;
/*
@@ -392,7 +392,7 @@ cleanup:
* Unlock vnode if needed
*/
if (locked)
- VOP_UNLOCK(vp, p);
+ VOP_UNLOCK(vp, 0, p);
/*
* Release the kernel mapping.
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index 9fe4d40a1633..addfbefe46e9 100644
--- a/sys/i386/linux/linux_file.c
+++ b/sys/i386/linux/linux_file.c
@@ -462,8 +462,7 @@ again:
auio.uio_resid = buflen;
auio.uio_offset = off - (off_t)blockoff;
- error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, (int *) NULL,
- (u_int **) NULL);
+ error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, NULL);
if (error) {
goto out;
}
@@ -530,7 +529,7 @@ again:
eof:
*retval = nbytes - resid;
out:
- VOP_UNLOCK(vp, p);
+ VOP_UNLOCK(vp, 0, p);
free(buf, M_TEMP);
return error;
}
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index d0332cf5cd4a..7e99f0290556 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -237,7 +237,7 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval)
/*
* Lock no longer needed
*/
- VOP_UNLOCK(vp, p);
+ VOP_UNLOCK(vp, 0, p);
locked = 0;
/*
@@ -392,7 +392,7 @@ cleanup:
* Unlock vnode if needed
*/
if (locked)
- VOP_UNLOCK(vp, p);
+ VOP_UNLOCK(vp, 0, p);
/*
* Release the kernel mapping.