- updated overlayfs patchset

diff --git a/ovl01-vfs-add-i_op-dentry_open.patch b/ovl01-vfs-add-i_op-dentry_open.patch
index fc284893e01187c9dddd142f1ada28cdfa9746b9..f166fc559ed3140729464ec9c93152afbac94345 100644 (file)
--- a/ovl01-vfs-add-i_op-dentry_open.patch
+++ b/ovl01-vfs-add-i_op-dentry_open.patch
@@ -116,14 +116,14 @@ Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
        int lookup_flags = 0;
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1585,6 +1585,7 @@ struct inode_operations {
+@@ -1575,6 +1575,7 @@ struct inode_operations {
                           umode_t create_mode, int *opened);
-       int (*tmpfile) (struct inode *, struct dentry *, umode_t);
+       int (*tmpfile) (struct inode *, struct dentry *, umode_t);
        int (*set_acl)(struct inode *, struct posix_acl *, int);
 +      int (*dentry_open)(struct dentry *, struct file *, const struct cred *);
- } ____cacheline_aligned;
+       int (*may_create) (struct inode *, int);
+       int (*may_delete) (struct inode *, struct inode *, int);
  
- ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
 @@ -2019,6 +2020,7 @@ extern struct file *file_open_name(struc
  extern struct file *filp_open(const char *, int, umode_t);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,

diff --git a/ovl05-overlay-filesystem.patch b/ovl05-overlay-filesystem.patch
index b5e7735b0873c2de05c205af07937c0f2a43b3eb..395aae71095bd91140b99db7c1bff4921c042451 100644 (file)
--- a/ovl05-overlay-filesystem.patch
+++ b/ovl05-overlay-filesystem.patch
@@ -103,8 +103,8 @@ Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
  source "fs/fuse/Kconfig"
 +source "fs/overlayfs/Kconfig"
  
- config GENERIC_ACL
-       bool
+ menu "Caches"
+ 
 --- a/fs/Makefile
 +++ b/fs/Makefile
 @@ -105,6 +105,7 @@ obj-$(CONFIG_QNX6FS_FS)            += qnx6/
@@ -1092,7 +1092,7 @@ Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
 +      }
 +
 +      err = vfs_rename(old_upperdir->d_inode, olddentry,
-+                       new_upperdir->d_inode, newdentry, NULL);
++                       new_upperdir->d_inode, newdentry, NULL, 0);
 +
 +      if (err) {
 +              if (new_create && ovl_dentry_is_opaque(new))