diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2004-06-24 17:22:29 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2004-06-24 17:22:29 +0000 |
| commit | 4f3bf9b9b4ad6de962684ebaca288e7289e3874e (patch) | |
| tree | d4874bd3091a69f0e3a33a88e65887f5399ce670 /sys | |
| parent | 5e11031e052fae8e25741dbf1bd03fee60fb5577 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vfs_extattr.c | 12 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 55b1a3ee7243..2fffe6350d30 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -4424,9 +4424,8 @@ extattr_get_vp(struct vnode *vp, int attrnamespace, const char *attrname, auio.uio_td = td; auiop = &auio; cnt = nbytes; - } else { + } else sizep = &size; - } #ifdef MAC error = mac_check_vnode_getextattr(td->td_ucred, vp, attrnamespace, @@ -4441,9 +4440,8 @@ extattr_get_vp(struct vnode *vp, int attrnamespace, const char *attrname, if (auiop != NULL) { cnt -= auio.uio_resid; td->td_retval[0] = cnt; - } else { + } else td->td_retval[0] = size; - } done: VOP_UNLOCK(vp, 0, td); @@ -4712,9 +4710,8 @@ extattr_list_vp(struct vnode *vp, int attrnamespace, void *data, auio.uio_td = td; auiop = &auio; cnt = nbytes; - } else { + } else sizep = &size; - } #ifdef MAC error = mac_check_vnode_listextattr(td->td_ucred, vp, attrnamespace); @@ -4728,9 +4725,8 @@ extattr_list_vp(struct vnode *vp, int attrnamespace, void *data, if (auiop != NULL) { cnt -= auio.uio_resid; td->td_retval[0] = cnt; - } else { + } else td->td_retval[0] = size; - } done: VOP_UNLOCK(vp, 0, td); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 55b1a3ee7243..2fffe6350d30 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4424,9 +4424,8 @@ extattr_get_vp(struct vnode *vp, int attrnamespace, const char *attrname, auio.uio_td = td; auiop = &auio; cnt = nbytes; - } else { + } else sizep = &size; - } #ifdef MAC error = mac_check_vnode_getextattr(td->td_ucred, vp, attrnamespace, @@ -4441,9 +4440,8 @@ extattr_get_vp(struct vnode *vp, int attrnamespace, const char *attrname, if (auiop != NULL) { cnt -= auio.uio_resid; td->td_retval[0] = cnt; - } else { + } else td->td_retval[0] = size; - } done: VOP_UNLOCK(vp, 0, td); @@ -4712,9 +4710,8 @@ extattr_list_vp(struct vnode *vp, int attrnamespace, void *data, auio.uio_td = td; auiop = &auio; cnt = nbytes; - } else { + } else sizep = &size; - } #ifdef MAC error = mac_check_vnode_listextattr(td->td_ucred, vp, attrnamespace); @@ -4728,9 +4725,8 @@ extattr_list_vp(struct vnode *vp, int attrnamespace, void *data, if (auiop != NULL) { cnt -= auio.uio_resid; td->td_retval[0] = cnt; - } else { + } else td->td_retval[0] = size; - } done: VOP_UNLOCK(vp, 0, td); |