- initial 2.6.31

[packages/kernel.git] / kernel-unionfs.patch

diff --git a/kernel-unionfs.patch b/kernel-unionfs.patch
index 608f1f4885340107812792f818548e1e55396efc..689219120f16e215318a8da9cde03698e4fbfaaf 100644 (file)
--- a/kernel-unionfs.patch
+++ b/kernel-unionfs.patch
@@ -727,8 +727,8 @@ index 4ed0ba4..6637e35 100644
                } else
                        off = &out->f_pos;
  
--              ret = do_splice_from(pipe, out, off, len, flags);
-+              ret = vfs_splice_from(pipe, out, off, len, flags);
+-              ret = do_splice_from(ipipe, out, off, len, flags);
++              ret = vfs_splice_from(ipipe, out, off, len, flags);
  
                if (off_out && copy_to_user(off_out, off, sizeof(loff_t)))
                        ret = -EFAULT;
@@ -736,8 +736,8 @@ index 4ed0ba4..6637e35 100644
                } else
                        off = &in->f_pos;
  
--              ret = do_splice_to(in, off, pipe, len, flags);
-+              ret = vfs_splice_to(in, off, pipe, len, flags);
+-              ret = do_splice_to(in, off, opipe, len, flags);
++              ret = vfs_splice_to(in, off, opipe, len, flags);
  
                if (off_in && copy_to_user(off_in, off, sizeof(loff_t)))
                        ret = -EFAULT;