Author: jhb
Date: Wed Mar 10 19:47:05 2010
New Revision: 204970
URL: http://svn.freebsd.org/changeset/base/204970
Log:
MFC 204638:
Allow lseek(SEEK_END) to work on disk devices by using the DIOCGMEDIASIZE
to determine the media size.
Modified:
stable/8/sys/kern/vfs_syscalls.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/8/sys/kern/vfs_syscalls.c Wed Mar 10 19:32:53 2010
(r204969)
+++ stable/8/sys/kern/vfs_syscalls.c Wed Mar 10 19:47:05 2010
(r204970)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/bio.h>
#include <sys/buf.h>
+#include <sys/disk.h>
#include <sys/sysent.h>
#include <sys/malloc.h>
#include <sys/mount.h>
@@ -1914,7 +1915,7 @@ lseek(td, uap)
struct file *fp;
struct vnode *vp;
struct vattr vattr;
- off_t offset;
+ off_t offset, size;
int error, noneg;
int vfslocked;
@@ -1945,6 +1946,15 @@ lseek(td, uap)
VOP_UNLOCK(vp, 0);
if (error)
break;
+
+ /*
+ * If the file references a disk device, then fetch
+ * the media size and use that to determine the ending
+ * offset.
+ */
+ if (vattr.va_size == 0 && vp->v_type == VCHR &&
+ fo_ioctl(fp, DIOCGMEDIASIZE, &size, cred, td) == 0)
+ vattr.va_size = size;
if (noneg &&
(vattr.va_size > OFF_MAX ||
(offset > 0 && vattr.va_size > OFF_MAX - offset))) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
