Unionfs: merge fixes for 2.6.31

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/splice.c b/fs/splice.c
index 986505fac626816beb4d45150eaa2a43f774422e..3753029f6af95728b0992d19381a6748c73ae702 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1332,7 +1332,7 @@ static long do_splice(struct file *in, loff_t __user *off_in,
                } else
                        off = &out->f_pos;
 
-               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;
@@ -1352,7 +1352,7 @@ static long do_splice(struct file *in, loff_t __user *off_in,
                } else
                        off = &in->f_pos;
 
-               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;