Unionfs: set append offset correctly for copied-up files

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

diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index 0fc79633af16911ee6f9590040e1769f07fe278e..83034c2d1f9f829571b3934dabfb1335f4d90bf7 100644 (file)
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -258,9 +258,13 @@ static int do_delayed_copyup(struct file *file)
                else
                        err = copyup_deleted_file(file, dentry, bstart,
                                                  bindex);
-
-               if (!err)
+               /* if succeeded, set lower open-file flags and break */
+               if (!err) {
+                       struct file *lower_file;
+                       lower_file = unionfs_lower_file_idx(file, bindex);
+                       lower_file->f_flags = file->f_flags;
                        break;
+               }
        }
        if (err || (bstart <= fbstart(file)))
                goto out;
@@ -491,6 +495,10 @@ static int __open_file(struct inode *inode, struct file *file)
                        }
                        return err;
                } else {
+                       /*
+                        * turn off writeable flags, to force delayed copyup
+                        * by caller.
+                        */
                        lower_flags &= ~(OPEN_WRITE_FLAGS);
                }
        }