talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Access correct union mount point in union_access. Old vnode is saved 

in savedvp variable and it is used for the argument of
MOUNTTOUNIONMOUNT().  I didn't realize ap->a_vp is modified before
MOUNTTOUNIONMOUNT(), so the change by revision 1.22 is incorrect.
This commit is contained in:
KATO Takenori 1997-05-02 03:21:54 +00:00
parent e37a137d7a
commit 5f3f68a8ba
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/fs/unionfs/union_vnops.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
* $Id: union_vnops.c,v 1.30 1997/04/27 10:49:37 kato Exp $
* $Id: union_vnops.c,v 1.31 1997/04/29 02:06:07 kato Exp $
*/
#include <sys/param.h>
@ -644,6 +644,7 @@ union_access(ap)
struct proc *p = ap->a_p;
int error = EACCES;
struct vnode *vp;
struct vnode *savedvp;
if ((vp = un->un_uppervp) != NULLVP) {
FIXUP(un, p);
@ -653,10 +654,11 @@ union_access(ap)
if ((vp = un->un_lowervp) != NULLVP) {
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
savedvp = ap->a_vp;
ap->a_vp = vp;
error = VCALL(vp, VOFFSET(vop_access), ap);
if (error == 0) {
struct union_mount *um = MOUNTTOUNIONMOUNT(ap->a_vp->v_mount);
struct union_mount *um = MOUNTTOUNIONMOUNT(savedvp->v_mount);
if (um->um_op == UNMNT_BELOW) {
ap->a_cred = um->um_cred;

6
sys/miscfs/union/union_vnops.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
* $Id: union_vnops.c,v 1.30 1997/04/27 10:49:37 kato Exp $
* $Id: union_vnops.c,v 1.31 1997/04/29 02:06:07 kato Exp $
*/
#include <sys/param.h>
@ -644,6 +644,7 @@ union_access(ap)
struct proc *p = ap->a_p;
int error = EACCES;
struct vnode *vp;
struct vnode *savedvp;
if ((vp = un->un_uppervp) != NULLVP) {
FIXUP(un, p);
@ -653,10 +654,11 @@ union_access(ap)
if ((vp = un->un_lowervp) != NULLVP) {
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
savedvp = ap->a_vp;
ap->a_vp = vp;
error = VCALL(vp, VOFFSET(vop_access), ap);
if (error == 0) {
struct union_mount *um = MOUNTTOUNIONMOUNT(ap->a_vp->v_mount);
struct union_mount *um = MOUNTTOUNIONMOUNT(savedvp->v_mount);
if (um->um_op == UNMNT_BELOW) {
ap->a_cred = um->um_cred;