kernel-unionfs-vserver.patch

   1 diff -urp a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
   2 --- a/fs/unionfs/commonfops.c   2007-09-20 16:19:41.984646750 +0200
   3 +++ b/fs/unionfs/commonfops.c   2007-09-20 16:25:09.237098750 +0200
   4 @@ -88,7 +88,7 @@ retry:
   5                                             lower_dentry->d_inode);
   6         }
   7         lower_dir_dentry = lock_parent(lower_dentry);
   8 -       err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
   9 +       err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL);
  10         unlock_dir(lower_dir_dentry);
  11
  12  out:
  13 diff -urp a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
  14 --- a/fs/unionfs/copyup.c       2007-09-20 16:19:41.984646750 +0200
  15 +++ b/fs/unionfs/copyup.c       2007-09-20 16:25:09.237098750 +0200
  16 @@ -474,7 +474,7 @@ out_unlink:
  17          * quota, or something else happened so let's unlink; we don't
  18          * really care about the return value of vfs_unlink
  19          */
  20 -       vfs_unlink(new_lower_parent_dentry->d_inode, new_lower_dentry);
  21 +       vfs_unlink(new_lower_parent_dentry->d_inode, new_lower_dentry, NULL);
  22
  23         if (copyup_file) {
  24                 /* need to close the file */
  25 diff -urp a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
  26 --- a/fs/unionfs/dirhelper.c    2007-09-20 16:19:41.996647500 +0200
  27 +++ b/fs/unionfs/dirhelper.c    2007-09-20 16:25:09.237098750 +0200
  28 @@ -70,7 +70,7 @@ int do_delete_whiteouts(struct dentry *d
  29                                 break;
  30                         }
  31                         if (lower_dentry->d_inode)
  32 -                               err = vfs_unlink(lower_dir, lower_dentry);
  33 +                               err = vfs_unlink(lower_dir, lower_dentry, NULL);
  34                         dput(lower_dentry);
  35                         if (err)
  36                                 break;
  37 diff -urp a/fs/unionfs/inode.c b/fs/unionfs/inode.c
  38 --- a/fs/unionfs/inode.c        2007-09-20 16:19:41.996647500 +0200
  39 +++ b/fs/unionfs/inode.c        2007-09-20 16:25:09.241099000 +0200
  40 @@ -89,7 +89,7 @@
  41         lower_dir_dentry = lock_parent_wh(wh_dentry);
  42         /* see Documentation/filesystems/unionfs/issues.txt */
  43         lockdep_off();
  44 -       err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
  45 +       err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry, NULL);
  46         lockdep_on();
  47         unlock_dir(lower_dir_dentry);
  48
  49 @@ -282,7 +282,7 @@
  50                         /* see Documentation/filesystems/unionfs/issues.txt */
  51                         lockdep_off();
  52                         err = vfs_unlink(lower_dir_dentry->d_inode,
  53 -                                        whiteout_dentry);
  54 +                                        whiteout_dentry, NULL);
  55                         lockdep_on();
  56                 }
  57
  58 @@ -315,7 +315,7 @@
  59                 /* see Documentation/filesystems/unionfs/issues.txt */
  60                 lockdep_off();
  61                 err = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode,
  62 -                              lower_new_dentry);
  63 +                              lower_new_dentry, NULL);
  64                 lockdep_on();
  65         }
  66         unlock_dir(lower_dir_dentry);
  67 @@ -348,7 +348,7 @@
  68                                 /* do vfs_link */
  69                                 err = vfs_link(lower_old_dentry,
  70                                                lower_dir_dentry->d_inode,
  71 -                                              lower_new_dentry);
  72 +                                              lower_new_dentry, NULL);
  73                                 lockdep_on();
  74                                 unlock_dir(lower_dir_dentry);
  75                                 goto check_link;
  76 @@ -505,7 +505,7 @@
  77
  78         mode = S_IALLUGO;
  79         err = vfs_symlink(lower_parent_dentry->d_inode, lower_dentry,
  80 -                         symname, mode);
  81 +                         symname, mode, NULL);
  82         if (!err) {
  83                 err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
  84                 if (!err) {
  85 @@ -629,7 +629,7 @@
  86                 }
  87
  88                 err = vfs_mkdir(lower_parent_dentry->d_inode, lower_dentry,
  89 -                               mode);
  90 +                               mode, NULL);
  91
  92                 unlock_dir(lower_parent_dentry);
  93
  94 @@ -799,7 +799,7 @@
  95                 goto out;
  96         }
  97
  98 -       err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev);
  99 +       err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev, NULL);
 100         if (!err) {
 101                 err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
 102                 if (!err) {
 103 diff -urp a/fs/unionfs/rename.c b/fs/unionfs/rename.c
 104 --- a/fs/unionfs/rename.c       2007-09-20 16:19:42.000647750 +0200
 105 +++ b/fs/unionfs/rename.c       2007-09-20 16:25:09.249099500 +0200
 106 @@ -77,7 +77,7 @@ static int __unionfs_rename(struct inode
 107                 lower_wh_dir_dentry = lock_parent(lower_wh_dentry);
 108                 if (!(err = is_robranch_super(old_dentry->d_sb, bindex)))
 109                         err = vfs_unlink(lower_wh_dir_dentry->d_inode,
 110 -                                        lower_wh_dentry);
 111 +                                        lower_wh_dentry, NULL);
 112
 113                 dput(lower_wh_dentry);
 114                 unlock_dir(lower_wh_dir_dentry);
 115 @@ -196,7 +196,7 @@ static int do_unionfs_rename(struct inod
 116                 unlink_dir_dentry = lock_parent(unlink_dentry);
 117                 if (!(err = is_robranch_super(old_dir->i_sb, bindex)))
 118                         err = vfs_unlink(unlink_dir_dentry->d_inode,
 119 -                                        unlink_dentry);
 120 +                                        unlink_dentry, NULL);
 121
 122                 fsstack_copy_attr_times(new_dentry->d_parent->d_inode,
 123                                         unlink_dir_dentry->d_inode);
 124 diff -urp a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
 125 --- a/fs/unionfs/sioq.c 2007-09-20 16:19:42.000647750 +0200
 126 +++ b/fs/unionfs/sioq.c 2007-09-20 16:25:09.249099500 +0200
 127 @@ -69,7 +69,7 @@ void __unionfs_mkdir(struct work_struct
 128         struct sioq_args *args = container_of(work, struct sioq_args, work);
 129         struct mkdir_args *m = &args->mkdir;
 130
 131 -       args->err = vfs_mkdir(m->parent, m->dentry, m->mode);
 132 +       args->err = vfs_mkdir(m->parent, m->dentry, m->mode, NULL);
 133         complete(&args->comp);
 134  }
 135
 136 @@ -78,7 +78,7 @@ void __unionfs_mknod(struct work_struct
 137         struct sioq_args *args = container_of(work, struct sioq_args, work);
 138         struct mknod_args *m = &args->mknod;
 139
 140 -       args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev);
 141 +       args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev, NULL);
 142         complete(&args->comp);
 143  }
 144
 145 @@ -87,7 +87,7 @@ void __unionfs_symlink(struct work_struc
 146         struct sioq_args *args = container_of(work, struct sioq_args, work);
 147         struct symlink_args *s = &args->symlink;
 148
 149 -       args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode);
 150 +       args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode, NULL);
 151         complete(&args->comp);
 152  }
 153
 154 @@ -96,7 +96,7 @@ void __unionfs_unlink(struct work_struct
 155         struct sioq_args *args = container_of(work, struct sioq_args, work);
 156         struct unlink_args *u = &args->unlink;
 157
 158 -       args->err = vfs_unlink(u->parent, u->dentry);
 159 +       args->err = vfs_unlink(u->parent, u->dentry, NULL);
 160         complete(&args->comp);
 161  }
 162
 163 diff -urp a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
 164 --- a/fs/unionfs/unlink.c       2007-09-20 16:19:42.004648000 +0200
 165 +++ b/fs/unionfs/unlink.c       2007-09-20 16:25:09.253099750 +0200
 166 @@ -44,7 +44,7 @@
 167         if (!err) {
 168                 /* see Documentation/filesystems/unionfs/issues.txt */
 169                 lockdep_off();
 170 -               err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
 171 +               err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL);
 172                 lockdep_on();
 173         }
 174         /* if vfs_unlink succeeded, update our inode's times */
 175 @@ -153,7 +153,7 @@
 176         if (!err) {
 177                 /* see Documentation/filesystems/unionfs/issues.txt */
 178                 lockdep_off();
 179 -               err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
 180 +               err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry, NULL);
 181                 lockdep_on();
 182         }
 183         dput(lower_dentry);