diff options
Diffstat (limited to 'patches')
-rw-r--r-- | patches/aufs2-base-20101021.patch (renamed from patches/aufs2-base-20100802.patch) | 12 | ||||
-rw-r--r-- | patches/aufs2-standalone-20101021.patch (renamed from patches/aufs2-standalone-20100802.patch) | 114 |
2 files changed, 59 insertions, 67 deletions
diff --git a/patches/aufs2-base-20100802.patch b/patches/aufs2-base-20101021.patch index e190f87..fda00b8 100644 --- a/patches/aufs2-base-20100802.patch +++ b/patches/aufs2-base-20101021.patch @@ -1,10 +1,10 @@ aufs2 base patch for linux-2.6. diff --git a/fs/namei.c b/fs/namei.c -index 868d0cb..6e92c81 100644 +index 17ea76b..56e8ece 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1178,7 +1178,7 @@ out: +@@ -1168,7 +1168,7 @@ out: * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ @@ -13,7 +13,7 @@ index 868d0cb..6e92c81 100644 { int err; -@@ -1188,7 +1188,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) +@@ -1178,7 +1178,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) return __lookup_hash(&nd->last, nd->path.dentry, nd); } @@ -23,10 +23,10 @@ index 868d0cb..6e92c81 100644 { unsigned long hash; diff --git a/fs/splice.c b/fs/splice.c -index efdbfec..e01a51e 100644 +index 8f1dfae..278c94f 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -1104,8 +1104,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); +@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); /* * Attempt to initiate a splice from pipe to file. */ @@ -37,7 +37,7 @@ index efdbfec..e01a51e 100644 { ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); -@@ -1132,9 +1132,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, /* * Attempt to initiate a splice from a file to a pipe. */ diff --git a/patches/aufs2-standalone-20100802.patch b/patches/aufs2-standalone-20101021.patch index 631d981..2df3fbe 100644 --- a/patches/aufs2-standalone-20100802.patch +++ b/patches/aufs2-standalone-20101021.patch @@ -1,10 +1,10 @@ aufs2 standalone patch for linux-2.6. diff --git a/fs/namei.c b/fs/namei.c -index 6e92c81..334130e 100644 +index 56e8ece..ba75f28 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -348,6 +348,7 @@ int deny_write_access(struct file * file) +@@ -347,6 +347,7 @@ int deny_write_access(struct file * file) return 0; } @@ -12,7 +12,7 @@ index 6e92c81..334130e 100644 /** * path_get - get a reference to a path -@@ -1187,6 +1188,7 @@ struct dentry *lookup_hash(struct nameidata *nd) +@@ -1177,6 +1178,7 @@ struct dentry *lookup_hash(struct nameidata *nd) return ERR_PTR(err); return __lookup_hash(&nd->last, nd->path.dentry, nd); } @@ -20,7 +20,7 @@ index 6e92c81..334130e 100644 int __lookup_one_len(const char *name, struct qstr *this, struct dentry *base, int len) -@@ -1209,6 +1211,7 @@ int __lookup_one_len(const char *name, struct qstr *this, +@@ -1199,6 +1201,7 @@ int __lookup_one_len(const char *name, struct qstr *this, this->hash = end_name_hash(hash); return 0; } @@ -29,10 +29,10 @@ index 6e92c81..334130e 100644 /** * lookup_one_len - filesystem helper to lookup single pathname component diff --git a/fs/namespace.c b/fs/namespace.c -index 88058de..397afcc 100644 +index 2e10cb1..8fa77c4 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1279,6 +1279,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, +@@ -1283,6 +1283,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } @@ -41,7 +41,7 @@ index 88058de..397afcc 100644 static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) { diff --git a/fs/notify/group.c b/fs/notify/group.c -index 0e16771..3fab10a 100644 +index d309f38..f0e9568 100644 --- a/fs/notify/group.c +++ b/fs/notify/group.c @@ -22,6 +22,7 @@ @@ -52,68 +52,60 @@ index 0e16771..3fab10a 100644 #include <linux/fsnotify_backend.h> #include "fsnotify.h" -@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - fsnotify_recalc_global_mask(); - fsnotify_destroy_group(group); +@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) + if (atomic_dec_and_test(&group->refcnt)) + fsnotify_destroy_group(group); } +EXPORT_SYMBOL(fsnotify_put_group); /* - * Simply run the fsnotify_groups list and find a group which matches -@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask, + * Create a new fsnotify_group and hold a reference for the group returned. +@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) return group; } -+EXPORT_SYMBOL(fsnotify_obtain_group); -diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c -index 0399bcb..74cdc13 100644 ---- a/fs/notify/inode_mark.c -+++ b/fs/notify/inode_mark.c -@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry) - if (atomic_dec_and_test(&entry->refcnt)) - entry->free_mark(entry); ++EXPORT_SYMBOL(fsnotify_alloc_group); +diff --git a/fs/notify/mark.c b/fs/notify/mark.c +index 325185e..adede09 100644 +--- a/fs/notify/mark.c ++++ b/fs/notify/mark.c +@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) + if (atomic_dec_and_test(&mark->refcnt)) + mark->free_mark(mark); } +EXPORT_SYMBOL(fsnotify_put_mark); /* - * Recalculate the mask of events relevant to a given inode locked. -@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry) + * Any time a mark is getting freed we end up here. +@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) if (unlikely(atomic_dec_and_test(&group->num_marks))) fsnotify_final_destroy_group(group); } -+EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry); ++EXPORT_SYMBOL(fsnotify_destroy_mark); - /* - * Given a group, destroy all of the marks associated with that group. -@@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou - } - return NULL; - } -+EXPORT_SYMBOL(fsnotify_find_mark_entry); + void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) + { +@@ -277,6 +279,7 @@ err: - /* - * Nothing fancy, just initialize lists and locks and counters. -@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry, - entry->inode = NULL; - entry->free_mark = free_mark; + return ret; } -+EXPORT_SYMBOL(fsnotify_init_mark); ++EXPORT_SYMBOL(fsnotify_add_mark); /* - * Attach an initialized mark entry to a given group and inode. -@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry, - - return ret; + * clear any marks in a group in which mark->flags & flags is true +@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, + atomic_set(&mark->refcnt, 1); + mark->free_mark = free_mark; } -+EXPORT_SYMBOL(fsnotify_add_mark); ++EXPORT_SYMBOL(fsnotify_init_mark); - /** - * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes. + static int fsnotify_mark_destroy(void *ignored) + { diff --git a/fs/open.c b/fs/open.c -index 5463266..d248ead 100644 +index 630715f..1c864c7 100644 --- a/fs/open.c +++ b/fs/open.c -@@ -59,6 +59,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, +@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, mutex_unlock(&dentry->d_inode->i_mutex); return ret; } @@ -122,10 +114,10 @@ index 5463266..d248ead 100644 static long do_sys_truncate(const char __user *pathname, loff_t length) { diff --git a/fs/splice.c b/fs/splice.c -index e01a51e..4806358 100644 +index 278c94f..033f7ac 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -1128,6 +1128,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, +@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return splice_write(pipe, out, ppos, len, flags); } @@ -133,7 +125,7 @@ index e01a51e..4806358 100644 /* * Attempt to initiate a splice from a file to a pipe. -@@ -1154,6 +1155,7 @@ long do_splice_to(struct file *in, loff_t *ppos, +@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos, return splice_read(in, ppos, pipe, len, flags); } @@ -163,7 +155,7 @@ index 8d9c48f..29108aa 100644 int devcgroup_inode_mknod(int mode, dev_t dev) { diff --git a/security/security.c b/security/security.c -index 351942a..6ba84a8 100644 +index c53949f..0ae5b91 100644 --- a/security/security.c +++ b/security/security.c @@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode) @@ -212,17 +204,17 @@ index 351942a..6ba84a8 100644 } +EXPORT_SYMBOL(security_path_rename); - int security_path_truncate(struct path *path, loff_t length, - unsigned int time_attrs) -@@ -424,6 +430,7 @@ int security_path_truncate(struct path *path, loff_t length, + int security_path_truncate(struct path *path) + { +@@ -423,6 +429,7 @@ int security_path_truncate(struct path *path) return 0; - return security_ops->path_truncate(path, length, time_attrs); + return security_ops->path_truncate(path); } +EXPORT_SYMBOL(security_path_truncate); int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, mode_t mode) -@@ -432,6 +439,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, +@@ -431,6 +438,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, return 0; return security_ops->path_chmod(dentry, mnt, mode); } @@ -230,7 +222,7 @@ index 351942a..6ba84a8 100644 int security_path_chown(struct path *path, uid_t uid, gid_t gid) { -@@ -439,6 +447,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) +@@ -438,6 +446,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) return 0; return security_ops->path_chown(path, uid, gid); } @@ -238,7 +230,7 @@ index 351942a..6ba84a8 100644 int security_path_chroot(struct path *path) { -@@ -515,6 +524,7 @@ int security_inode_readlink(struct dentry *dentry) +@@ -514,6 +523,7 @@ int security_inode_readlink(struct dentry *dentry) return 0; return security_ops->inode_readlink(dentry); } @@ -246,7 +238,7 @@ index 351942a..6ba84a8 100644 int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) { -@@ -529,6 +539,7 @@ int security_inode_permission(struct inode *inode, int mask) +@@ -528,6 +538,7 @@ int security_inode_permission(struct inode *inode, int mask) return 0; return security_ops->inode_permission(inode, mask); } @@ -254,15 +246,15 @@ index 351942a..6ba84a8 100644 int security_inode_setattr(struct dentry *dentry, struct iattr *attr) { -@@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask) - { - return security_ops->file_permission(file, mask); +@@ -627,6 +638,7 @@ int security_file_permission(struct file *file, int mask) + + return fsnotify_perm(file, mask); } +EXPORT_SYMBOL(security_file_permission); int security_file_alloc(struct file *file) { -@@ -649,6 +661,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, +@@ -654,6 +666,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, return ret; return ima_file_mmap(file, prot); } |