1 --- aufs/fs/aufs25/vfsub.h~ 2008-05-26 23:48:46.000000000 +0200
2 +++ aufs/fs/aufs25/vfsub.h 2008-05-26 23:51:50.260679424 +0200
7 -#ifdef CONFIG_AUFS_BR_XFS
8 +#ifndef CONFIG_AUFS_BR_XFS
10 dev_t au_h_rdev(struct inode *h_inode, struct vfsmount *h_mnt,
11 struct dentry *h_dentry);
12 --- aufs/fs/aufs25/xino.c~ 2009-01-26 07:24:24.000000000 +0100
13 +++ aufs/fs/aufs25/xino.c 2009-07-22 18:12:16.356983962 +0200
17 file = dentry_open(dget(dentry), mntget(base_file->f_vfsmnt),
18 - O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE);
19 + O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE
20 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
25 AuErr("%.*s open err %ld\n", AuLNPair(name), PTR_ERR(file));
28 --- aufs/fs/aufs25/whout.c~ 2009-01-26 07:24:19.000000000 +0100
29 +++ aufs/fs/aufs25/whout.c 2009-07-24 12:13:57.149063895 +0200
32 vfsub_args_init(&vargs, &ign, dlgt,
33 (h_dir->i_mode & S_ISVTX)
34 - && wh_dentry->d_inode->i_uid != current->fsuid);
35 + && wh_dentry->d_inode->i_uid !=
36 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
42 vfsub_ign_hinode(&vargs, IN_DELETE, hdir);
43 err = vfsub_unlink(h_dir, wh_dentry, &vargs);
46 struct vfsub_args vargs;
49 - AuDebugOn(current->fsuid);
51 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
61 --- aufs/fs/aufs25/file.c~ 2009-01-26 07:24:29.000000000 +0100
62 +++ aufs/fs/aufs25/file.c 2009-07-24 12:16:59.015712355 +0200
64 if (file && au_test_nfs(h_dentry->d_sb))
65 h_file = au_h_intent(dentry, bindex, file);
67 - h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags);
68 + h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags
69 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
75 * a dirty trick for handling FMODE_EXEC and deny_write_access().
77 --- aufs/fs/aufs25/inode.c~ 2009-01-26 07:24:45.000000000 +0100
78 +++ aufs/fs/aufs25/inode.c 2009-07-24 12:19:05.229033182 +0200
81 int au_test_h_perm(struct inode *h_inode, int mask, int dlgt)
83 - if (!current->fsuid)
85 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
92 /* todo: fake nameidata? */
93 return vfsub_permission(h_inode, mask, NULL, dlgt);