[arch-commits] Commit in virtualbox/trunk (3 files)

[Sébastien Luttringer]

    Date: Wednesday, September 4, 2013 @ 21:51:32
  Author: seblu
Revision: 96769

Honor patch naming scheme

Added:
  virtualbox/trunk/005-linux-3.11.patch
    (from rev 96768, virtualbox/trunk/linux-3.11.patch)
Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/linux-3.11.patch

----------------------+
 005-linux-3.11.patch |   60 +++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD             |    2 -
 linux-3.11.patch     |   60 -------------------------------------------------
 3 files changed, 61 insertions(+), 61 deletions(-)

Copied: virtualbox/trunk/005-linux-3.11.patch (from rev 96768, virtualbox/trunk/linux-3.11.patch)
===================================================================
--- 005-linux-3.11.patch	                        (rev 0)
+++ 005-linux-3.11.patch	2013-09-04 19:51:32 UTC (rev 96769)
@@ -0,0 +1,60 @@
+diff -Nur VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c
+--- VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c	2013-07-04 13:59:34.000000000 +0000
++++ VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c	2013-09-03 13:21:25.314389481 +0000
+@@ -233,7 +233,11 @@
+  * b. failure to compute fake inode number
+  * c. filldir returns an error (see comment on that)
+  */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
++static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
++#else 
+ static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
++#endif 
+ {
+     TRACE();
+     for (;;)
+@@ -257,12 +261,18 @@
+                 /* skip erroneous entry and proceed */
+                 LogFunc(("sf_getdent error %d\n", err));
+                 dir->f_pos += 1;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
++                ctx->pos += 1; 
++#endif 
+                 continue;
+         }
+ 
+         /* d_name now contains a valid entry name */
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
++	sanity = ctx->pos + 0xbeef;
++#else 
+         sanity = dir->f_pos + 0xbeef;
++#endif 
+         fake_ino = sanity;
+         if (sanity - fake_ino)
+         {
+@@ -270,8 +280,12 @@
+             return -EINVAL;
+         }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
++        err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN); 
++#else 
+         err = filldir(opaque, d_name, strlen(d_name),
+                       dir->f_pos, fake_ino, DT_UNKNOWN);
++#endif 
+         if (err)
+         {
+             LogFunc(("filldir returned error %d\n", err));
+@@ -289,7 +303,11 @@
+ struct file_operations sf_dir_fops =
+ {
+     .open    = sf_dir_open,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
++ .iterate = sf_dir_iterate,
++#else 
+     .readdir = sf_dir_read,
++#endif 
+     .release = sf_dir_release,
+     .read    = generic_read_dir
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-04 17:05:07 UTC (rev 96768)
+++ PKGBUILD	2013-09-04 19:51:32 UTC (rev 96769)
@@ -56,7 +56,7 @@
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
         '004-system-xorg.patch'
-        'linux-3.11.patch')
+        '005-linux-3.11.patch')
 md5sums=('c4a36e2099a317f4715cd3861cdae238'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'

Deleted: linux-3.11.patch
===================================================================
--- linux-3.11.patch	2013-09-04 17:05:07 UTC (rev 96768)
+++ linux-3.11.patch	2013-09-04 19:51:32 UTC (rev 96769)
@@ -1,60 +0,0 @@
-diff -Nur VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c
---- VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c	2013-07-04 13:59:34.000000000 +0000
-+++ VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c	2013-09-03 13:21:25.314389481 +0000
-@@ -233,7 +233,11 @@
-  * b. failure to compute fake inode number
-  * c. filldir returns an error (see comment on that)
-  */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
-+#else 
- static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
-+#endif 
- {
-     TRACE();
-     for (;;)
-@@ -257,12 +261,18 @@
-                 /* skip erroneous entry and proceed */
-                 LogFunc(("sf_getdent error %d\n", err));
-                 dir->f_pos += 1;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
-+                ctx->pos += 1; 
-+#endif 
-                 continue;
-         }
- 
-         /* d_name now contains a valid entry name */
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
-+	sanity = ctx->pos + 0xbeef;
-+#else 
-         sanity = dir->f_pos + 0xbeef;
-+#endif 
-         fake_ino = sanity;
-         if (sanity - fake_ino)
-         {
-@@ -270,8 +280,12 @@
-             return -EINVAL;
-         }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
-+        err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN); 
-+#else 
-         err = filldir(opaque, d_name, strlen(d_name),
-                       dir->f_pos, fake_ino, DT_UNKNOWN);
-+#endif 
-         if (err)
-         {
-             LogFunc(("filldir returned error %d\n", err));
-@@ -289,7 +303,11 @@
- struct file_operations sf_dir_fops =
- {
-     .open    = sf_dir_open,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) 
-+ .iterate = sf_dir_iterate,
-+#else 
-     .readdir = sf_dir_read,
-+#endif 
-     .release = sf_dir_release,
-     .read    = generic_read_dir
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)