kernel-aufs-support.patch

   1 Index: linux-2.6.23/fs/namei.c
   2 ===================================================================
   3 RCS file: /ext1/sysadm/transparent/repository/linux-2.6.23/fs/namei.c,v
   4 retrieving revision 1.2
   5 retrieving revision 1.4
   6 diff -u -p -r1.2 -r1.4
   7 --- linux-2.6.23/fs/namei.c     29 Oct 2007 07:01:03 -0000      1.2
   8 +++ linux-2.6.23/fs/namei.c     29 Oct 2007 07:05:53 -0000      1.4
   9 @@ -2893,6 +2893,7 @@
  10  EXPORT_SYMBOL(vfs_unlink);
  11  EXPORT_SYMBOL(dentry_unhash);
  12  EXPORT_SYMBOL(generic_readlink);
  13 +EXPORT_SYMBOL(deny_write_access);
  14
  15  /* to be mentioned only in INIT_TASK */
  16  struct fs_struct init_fs = {
  17 Index: linux-2.6.27/fs/ecryptfs/inode.c
  18 ===================================================================
  19 retrieving revision 1.1
  20 retrieving revision 1.2
  21 diff -u -p -r1.1 -r1.2
  22 --- linux-2.6.27/fs/ecryptfs/inode.c    19 Dec 2008 03:05:27 -0000      1.1
  23 +++ linux-2.6.27/fs/ecryptfs/inode.c    19 Dec 2008 19:52:26 -0000      1.2
  24 @@ -430,9 +430,6 @@ out_lock:
  25         unlock_dir(lower_dir_dentry);
  26         dput(lower_new_dentry);
  27         dput(lower_old_dentry);
  28 -       d_drop(lower_old_dentry);
  29 -       d_drop(new_dentry);
  30 -       d_drop(old_dentry);
  31         return rc;
  32  }
  33
  34 @@ -444,7 +441,10 @@ static int ecryptfs_unlink(struct inode
  35         struct dentry *lower_dir_dentry;
  36
  37         lower_dir_dentry = lock_parent(lower_dentry);
  38 +       dget(lower_dentry);
  39 +       atomic_inc(&lower_dentry->d_inode->i_count);
  40         rc = vfs_unlink(lower_dir_inode, lower_dentry);
  41 +       dput(lower_dentry);
  42         if (rc) {
  43                 printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
  44                 goto out_unlock;
  45 @@ -455,6 +455,7 @@ static int ecryptfs_unlink(struct inode
  46         dentry->d_inode->i_ctime = dir->i_ctime;
  47         d_drop(dentry);
  48  out_unlock:
  49 +       iput(lower_dentry->d_inode);
  50         unlock_dir(lower_dir_dentry);
  51         return rc;
  52  }
  53 @@ -538,8 +539,12 @@ static int ecryptfs_rmdir(struct inode *
  54         fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
  55         dir->i_nlink = lower_dir_dentry->d_inode->i_nlink;
  56         unlock_dir(lower_dir_dentry);
  57 -       if (!rc)
  58 +       if (!rc) {
  59 +               struct inode *inode = dentry->d_inode;
  60 +               inode->i_nlink = ecryptfs_inode_to_lower(inode)->i_nlink;
  61 +               inode->i_ctime = dir->i_ctime;
  62                 d_drop(dentry);
  63 +       }
  64         dput(dentry);
  65         return rc;
  66  }
  67 Index: linux-2.6.19/fs/super.c
  68 ===================================================================
  69 RCS file: /proj/linux-2.6/repository/linux-2.6.19/fs/super.c,v
  70 retrieving revision 1.1
  71 retrieving revision 1.2
  72 diff -u -p -r1.1 -r1.2
  73 --- linux-2.6.19/fs/super.c     20 Feb 2008 05:23:09 -0000      1.1
  74 +++ linux-2.6.19/fs/super.c     20 Feb 2008 05:24:15 -0000      1.2
  75 @@ -250,6 +250,7 @@ int fsync_super(struct super_block *sb)
  76         __fsync_super(sb);
  77         return sync_blockdev(sb->s_bdev);
  78  }
  79 +EXPORT_SYMBOL(fsync_super);
  80
  81  /**
  82   *     generic_shutdown_super  -       common helper for ->kill_sb()
  83 Index: linux-2.6.22/fs/namei.c
  84 ===================================================================
  85 RCS file: /ext1/sysadm/transparent/repository/linux-2.6.22/fs/namei.c,v
  86 retrieving revision 1.1
  87 retrieving revision 1.3
  88 diff -u -p -r1.1 -r1.3
  89 --- linux-2.6.22/fs/namei.c     12 Jul 2007 02:55:19 -0000      1.1
  90 +++ linux-2.6.22/fs/namei.c     12 Jul 2007 03:00:50 -0000      1.3
  91 @@ -1280,7 +1280,7 @@ out:
  92         return err;
  93  }
  94
  95 -static struct dentry *__lookup_hash(struct qstr *name,
  96 +struct dentry *__lookup_hash(struct qstr *name,
  97                 struct dentry *base, struct nameidata *nd)
  98  {
  99         struct dentry *dentry;
 100 @@ -2766,6 +2766,7 @@ EXPORT_SYMBOL(follow_up);
 101  EXPORT_SYMBOL(get_write_access); /* binfmt_aout */
 102  EXPORT_SYMBOL(getname);
 103  EXPORT_SYMBOL(lock_rename);
 104 +EXPORT_SYMBOL(__lookup_hash);
 105  EXPORT_SYMBOL(lookup_one_len);
 106  EXPORT_SYMBOL(page_follow_link_light);
 107  EXPORT_SYMBOL(page_put_link);
 108 Index: linux-2.6.22/include/linux/namei.h
 109 ===================================================================
 110 RCS file: /ext1/sysadm/transparent/repository/linux-2.6.22/include/linux/namei.h,v
 111 retrieving revision 1.1
 112 retrieving revision 1.2
 113 diff -u -p -r1.1 -r1.2
 114 --- linux-2.6.22/include/linux/namei.h  12 Jul 2007 02:55:19 -0000      1.1
 115 +++ linux-2.6.22/include/linux/namei.h  12 Jul 2007 02:55:20 -0000      1.2
 116 @@ -81,6 +81,7 @@ extern struct file *lookup_instantiate_f
 117  extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
 118  extern void release_open_intent(struct nameidata *);
 119
 120 +struct dentry * __lookup_hash(struct qstr *name, struct dentry * base, struct nameidata *nd);
 121  extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
 122  extern struct dentry *lookup_one_len_kern(const char *, struct dentry *, int);
 123
 124 Index: fs/file_table.c
 125 ===================================================================
 126 RCS file: /ext1/sysadm/transparent/repository/linux-2.6.23-rc6/fs/file_table.c,v
 127 retrieving revision 1.1
 128 retrieving revision 1.2
 129 diff -u -p -r1.1 -r1.2
 130 --- linux/fs/file_table.c       12 Sep 2007 16:24:04 -0000      1.1
 131 +++ linux/fs/file_table.c       12 Sep 2007 16:24:38 -0000      1.2
 132 @@ -243,6 +243,7 @@ void put_filp(struct file *file)
 133                 file_free(file);
 134         }
 135  }
 136 +EXPORT_SYMBOL(put_filp);
 137
 138  void file_move(struct file *file, struct list_head *list)
 139  {