Author: jhb
Date: Fri May 31 16:15:22 2013
New Revision: 251184
URL: http://svnweb.freebsd.org/changeset/base/251184
Log:
Style fixes to vn_ioctl().
Suggested by: bde
Modified:
head/sys/kern/vfs_vnops.c
Modified: head/sys/kern/vfs_vnops.c
==============================================================================
--- head/sys/kern/vfs_vnops.c Fri May 31 16:00:42 2013 (r251183)
+++ head/sys/kern/vfs_vnops.c Fri May 31 16:15:22 2013 (r251184)
@@ -1355,31 +1355,32 @@ vn_ioctl(fp, com, data, active_cred, td)
struct ucred *active_cred;
struct thread *td;
{
- struct vnode *vp = fp->f_vnode;
struct vattr vattr;
+ struct vnode *vp;
int error;
- error = ENOTTY;
+ vp = fp->f_vnode;
switch (vp->v_type) {
- case VREG:
case VDIR:
- if (com == FIONREAD) {
+ case VREG:
+ switch (com) {
+ case FIONREAD:
vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(vp, &vattr, active_cred);
VOP_UNLOCK(vp, 0);
- if (!error)
+ if (error == 0)
*(int *)data = vattr.va_size - fp->f_offset;
- } else if (com == FIONBIO || com == FIOASYNC) /* XXX */
- error = 0;
- else
- error = VOP_IOCTL(vp, com, data, fp->f_flag,
- active_cred, td);
- break;
-
+ return (error);
+ case FIONBIO:
+ case FIOASYNC:
+ return (0);
+ default:
+ return (VOP_IOCTL(vp, com, data, fp->f_flag,
+ active_cred, td));
+ }
default:
- break;
+ return (ENOTTY);
}
- return (error);
}
/*
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
