Add a f_vnode field to struct file.

Several of the subtypes have an associated vnode which is used for
stuff like the f*() functions.

By giving the vnode a speparate field, a number of checks for the specific
subtype can be replaced simply with a check for f_vnode != NULL, and
we can later free f_data up to subtype specific use.

At this point in time, f_data still points to the vnode, so any code I
might have overlooked will still work.

1 files changed, 1 insertions, 1 deletions

diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 7e446d1..af0d0ab 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -313,7 +313,7 @@ mmap(td, uap)
 		 */
 		if (fp->f_flag & FPOSIXSHM)
 			flags |= MAP_NOSYNC;
-		vp = fp->f_data;
+		vp = fp->f_vnode;
 		error = vget(vp, LK_EXCLUSIVE, td);
 		if (error)
 			goto done;