xnu-2050.48.11.tar.gz

[apple/xnu.git] / bsd / kern / kern_symfile.c

diff --git a/bsd/kern/kern_symfile.c b/bsd/kern/kern_symfile.c
index 1636b4ab58b9414986fc19e36a933318c9df5a3b..2e1965dfd0685a2da4a5d60b55394a27f8f0ef10 100644 (file)
--- a/bsd/kern/kern_symfile.c
+++ b/bsd/kern/kern_symfile.c
@@ -203,7 +203,7 @@ kern_open_file_for_direct_io(const char * name,
     int                                isssd = 0;
     uint32_t                    flags = 0;
     uint32_t                   blksize;
     int                                isssd = 0;
     uint32_t                    flags = 0;
     uint32_t                   blksize;

-    off_t                      maxiocount, count;
+    off_t                      maxiocount, count, segcount;

     boolean_t                   locked = FALSE;
 
     int (*do_ioctl)(void * p1, void * p2, u_long theIoctl, caddr_t result);
     boolean_t                   locked = FALSE;
 
     int (*do_ioctl)(void * p1, void * p2, u_long theIoctl, caddr_t result);


@@ -406,14 +406,20 @@ kern_open_file_for_direct_io(const char * name,
         maxiocount = count;
 
     error = do_ioctl(p1, p2, DKIOCGETMAXSEGMENTBYTECOUNTREAD, (caddr_t) &count);
         maxiocount = count;
 
     error = do_ioctl(p1, p2, DKIOCGETMAXSEGMENTBYTECOUNTREAD, (caddr_t) &count);

+    if (!error)
+       error = do_ioctl(p1, p2, DKIOCGETMAXSEGMENTCOUNTREAD, (caddr_t) &segcount);

     if (error)
     if (error)

-        count = 0;
+        count = segcount = 0;
+    count *= segcount;

     if (count && (count < maxiocount))
         maxiocount = count;
 
     error = do_ioctl(p1, p2, DKIOCGETMAXSEGMENTBYTECOUNTWRITE, (caddr_t) &count);
     if (count && (count < maxiocount))
         maxiocount = count;
 
     error = do_ioctl(p1, p2, DKIOCGETMAXSEGMENTBYTECOUNTWRITE, (caddr_t) &count);

+    if (!error)
+       error = do_ioctl(p1, p2, DKIOCGETMAXSEGMENTCOUNTWRITE, (caddr_t) &segcount);

     if (error)
     if (error)

-        count = 0;
+        count = segcount = 0;
+    count *= segcount;

     if (count && (count < maxiocount))
         maxiocount = count;
 
     if (count && (count < maxiocount))
         maxiocount = count;