summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorTobias Powalowski <tobias@T-POWA-LX.(none)>2010-05-17 09:49:01 +0200
committerTobias Powalowski <tobias@T-POWA-LX.(none)>2010-05-17 09:49:01 +0200
commit36c10d7509d0d7ab95f67c74fd4c9802dd266d8b (patch)
treeddc0a3887afbe67e91fb905f5aa03bfd094e3bbf /patches
parent893483c599e93e474dbd4bfae1bca6a0cd131612 (diff)
bump to new major .34 series
Diffstat (limited to 'patches')
-rw-r--r--patches/aufs2-base-20100517.patch (renamed from patches/aufs2-base-20100425.patch)14
-rw-r--r--patches/aufs2-standalone-20100517.patch (renamed from patches/aufs2-standalone-20100425.patch)98
2 files changed, 56 insertions, 56 deletions
diff --git a/patches/aufs2-base-20100425.patch b/patches/aufs2-base-20100517.patch
index 2ec0d39..9f02505 100644
--- a/patches/aufs2-base-20100425.patch
+++ b/patches/aufs2-base-20100517.patch
@@ -1,10 +1,10 @@
-aufs2 base patch for linux-2.6.33
+aufs2 base patch for linux-2.6.
diff --git a/fs/namei.c b/fs/namei.c
-index a4855af..1d12d37 100644
+index a7dce91..c345520 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -1207,7 +1207,7 @@ out:
+@@ -1177,7 +1177,7 @@ out:
* needs parent already locked. Doesn't follow mounts.
* SMP-safe.
*/
@@ -13,7 +13,7 @@ index a4855af..1d12d37 100644
{
int err;
-@@ -1217,7 +1217,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1187,7 +1187,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
@@ -23,10 +23,10 @@ index a4855af..1d12d37 100644
{
unsigned long hash;
diff --git a/fs/splice.c b/fs/splice.c
-index 3920866..b13a9a2 100644
+index 9313b61..b9e871f 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1053,8 +1053,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1054,8 +1054,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
@@ -37,7 +37,7 @@ index 3920866..b13a9a2 100644
{
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int);
-@@ -1081,9 +1081,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1082,9 +1082,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-20100425.patch b/patches/aufs2-standalone-20100517.patch
index c945ba1..ba5922a 100644
--- a/patches/aufs2-standalone-20100425.patch
+++ b/patches/aufs2-standalone-20100517.patch
@@ -1,10 +1,10 @@
-aufs2 standalone patch for linux-2.6.33
+aufs2 standalone patch for linux-2.6.
diff --git a/fs/namei.c b/fs/namei.c
-index 1d12d37..7cb8e5d 100644
+index c345520..b4e15a2 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -349,6 +349,7 @@ int deny_write_access(struct file * file)
+@@ -348,6 +348,7 @@ int deny_write_access(struct file * file)
return 0;
}
@@ -12,7 +12,7 @@ index 1d12d37..7cb8e5d 100644
/**
* path_get - get a reference to a path
-@@ -1216,6 +1217,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1186,6 +1187,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 1d12d37..7cb8e5d 100644
int __lookup_one_len(const char *name, struct qstr *this,
struct dentry *base, int len)
-@@ -1238,6 +1240,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+@@ -1208,6 +1210,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
this->hash = end_name_hash(hash);
return 0;
}
@@ -29,17 +29,17 @@ index 1d12d37..7cb8e5d 100644
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
-index c768f73..0fd78c3 100644
+index 8174c8a..9b90f70 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -39,6 +39,7 @@
-
- /* spinlock for vfsmount related operations, inplace of dcache_lock */
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
-+EXPORT_SYMBOL(vfsmount_lock);
+@@ -1282,6 +1282,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ }
+ return 0;
+ }
++EXPORT_SYMBOL(iterate_mounts);
- static int event;
- static DEFINE_IDA(mnt_id_ida);
+ 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
--- a/fs/notify/group.c
@@ -66,10 +66,10 @@ index 0e16771..3fab10a 100644
}
+EXPORT_SYMBOL(fsnotify_obtain_group);
diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
-index 3165d85..4586162 100644
+index 0399bcb..74cdc13 100644
--- a/fs/notify/inode_mark.c
+++ b/fs/notify/inode_mark.c
-@@ -106,6 +106,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry)
+@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry)
if (atomic_dec_and_test(&entry->refcnt))
entry->free_mark(entry);
}
@@ -77,7 +77,7 @@ index 3165d85..4586162 100644
/*
* Recalculate the mask of events relevant to a given inode locked.
-@@ -216,6 +217,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
+@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
if (unlikely(atomic_dec_and_test(&group->num_marks)))
fsnotify_final_destroy_group(group);
}
@@ -85,7 +85,7 @@ index 3165d85..4586162 100644
/*
* Given a group, destroy all of the marks associated with that group.
-@@ -282,6 +284,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou
+@@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou
}
return NULL;
}
@@ -93,7 +93,7 @@ index 3165d85..4586162 100644
/*
* Nothing fancy, just initialize lists and locks and counters.
-@@ -298,6 +301,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
+@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
entry->inode = NULL;
entry->free_mark = free_mark;
}
@@ -101,7 +101,7 @@ index 3165d85..4586162 100644
/*
* Attach an initialized mark entry to a given group and inode.
-@@ -353,6 +357,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
+@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
return ret;
}
@@ -110,10 +110,10 @@ index 3165d85..4586162 100644
/**
* fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes.
diff --git a/fs/open.c b/fs/open.c
-index 040cef7..453b782 100644
+index 74e5cd9..8192b46 100644
--- a/fs/open.c
+++ b/fs/open.c
-@@ -226,6 +226,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+@@ -225,6 +225,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 +122,10 @@ index 040cef7..453b782 100644
static long do_sys_truncate(const char __user *pathname, loff_t length)
{
diff --git a/fs/splice.c b/fs/splice.c
-index b13a9a2..3931ee0 100644
+index b9e871f..b069be4 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1077,6 +1077,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1078,6 +1078,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return splice_write(pipe, out, ppos, len, flags);
}
@@ -133,7 +133,7 @@ index b13a9a2..3931ee0 100644
/*
* Attempt to initiate a splice from a file to a pipe.
-@@ -1103,6 +1104,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1104,6 +1105,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
@@ -142,19 +142,19 @@ index b13a9a2..3931ee0 100644
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/security/commoncap.c b/security/commoncap.c
-index f800fdb..ea457bc 100644
+index 6166973..a702444 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
-@@ -946,3 +946,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
}
return ret;
}
+EXPORT_SYMBOL(cap_file_mmap);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 6cf8fd2..008e0d8 100644
+index f77c604..743f39b 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
-@@ -514,6 +514,7 @@ found:
+@@ -515,6 +515,7 @@ found:
return -EPERM;
}
@@ -163,42 +163,42 @@ index 6cf8fd2..008e0d8 100644
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index 122b748..a4a3d99 100644
+index 687c6fd..e9e5f6b 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -404,6 +404,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
+@@ -411,6 +411,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
return 0;
- return security_ops->path_mkdir(path, dentry, mode);
+ return security_ops->path_mkdir(dir, dentry, mode);
}
+EXPORT_SYMBOL(security_path_mkdir);
- int security_path_rmdir(struct path *path, struct dentry *dentry)
+ int security_path_rmdir(struct path *dir, struct dentry *dentry)
{
-@@ -411,6 +412,7 @@ int security_path_rmdir(struct path *path, struct dentry *dentry)
+@@ -418,6 +419,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
return 0;
- return security_ops->path_rmdir(path, dentry);
+ return security_ops->path_rmdir(dir, dentry);
}
+EXPORT_SYMBOL(security_path_rmdir);
- int security_path_unlink(struct path *path, struct dentry *dentry)
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
{
-@@ -418,6 +420,7 @@ int security_path_unlink(struct path *path, struct dentry *dentry)
+@@ -425,6 +427,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
return 0;
- return security_ops->path_unlink(path, dentry);
+ return security_ops->path_unlink(dir, dentry);
}
+EXPORT_SYMBOL(security_path_unlink);
- int security_path_symlink(struct path *path, struct dentry *dentry,
+ int security_path_symlink(struct path *dir, struct dentry *dentry,
const char *old_name)
-@@ -426,6 +429,7 @@ int security_path_symlink(struct path *path, struct dentry *dentry,
+@@ -433,6 +436,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
return 0;
- return security_ops->path_symlink(path, dentry, old_name);
+ return security_ops->path_symlink(dir, dentry, old_name);
}
+EXPORT_SYMBOL(security_path_symlink);
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
struct dentry *new_dentry)
-@@ -434,6 +438,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -441,6 +445,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
return 0;
return security_ops->path_link(old_dentry, new_dir, new_dentry);
}
@@ -206,7 +206,7 @@ index 122b748..a4a3d99 100644
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry)
-@@ -444,6 +449,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+@@ -451,6 +456,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
return security_ops->path_rename(old_dir, old_dentry, new_dir,
new_dentry);
}
@@ -214,7 +214,7 @@ index 122b748..a4a3d99 100644
int security_path_truncate(struct path *path, loff_t length,
unsigned int time_attrs)
-@@ -452,6 +458,7 @@ int security_path_truncate(struct path *path, loff_t length,
+@@ -459,6 +465,7 @@ int security_path_truncate(struct path *path, loff_t length,
return 0;
return security_ops->path_truncate(path, length, time_attrs);
}
@@ -222,7 +222,7 @@ index 122b748..a4a3d99 100644
int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
mode_t mode)
-@@ -460,6 +467,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+@@ -467,6 +474,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
return 0;
return security_ops->path_chmod(dentry, mnt, mode);
}
@@ -230,7 +230,7 @@ index 122b748..a4a3d99 100644
int security_path_chown(struct path *path, uid_t uid, gid_t gid)
{
-@@ -467,6 +475,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+@@ -474,6 +482,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 +238,7 @@ index 122b748..a4a3d99 100644
int security_path_chroot(struct path *path)
{
-@@ -543,6 +552,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -550,6 +559,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return security_ops->inode_readlink(dentry);
}
@@ -246,7 +246,7 @@ index 122b748..a4a3d99 100644
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
{
-@@ -557,6 +567,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -564,6 +574,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return security_ops->inode_permission(inode, mask);
}
@@ -254,7 +254,7 @@ index 122b748..a4a3d99 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -657,6 +668,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -664,6 +675,7 @@ int security_file_permission(struct file *file, int mask)
{
return security_ops->file_permission(file, mask);
}
@@ -262,7 +262,7 @@ index 122b748..a4a3d99 100644
int security_file_alloc(struct file *file)
{
-@@ -684,6 +696,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -691,6 +703,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
return ret;
return ima_file_mmap(file, prot);
}