summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/aufs2/files/aufs2-standalone-39.patch')
-rw-r--r--sys-fs/aufs2/files/aufs2-standalone-39.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys-fs/aufs2/files/aufs2-standalone-39.patch b/sys-fs/aufs2/files/aufs2-standalone-39.patch
index 57dd820c24fa..777febabe1cf 100644
--- a/sys-fs/aufs2/files/aufs2-standalone-39.patch
+++ b/sys-fs/aufs2/files/aufs2-standalone-39.patch
@@ -1,4 +1,4 @@
-aufs2.1 standalone patch for linux-2.6.
+aufs2.1 standalone patch for linux-2.6.39
diff --git a/fs/file_table.c b/fs/file_table.c
index 01e4c1e..0e800e2 100644
@@ -26,7 +26,7 @@ index 33c963d..e31e8d5 100644
/*
* iprune_sem provides exclusion between the icache shrinking and the
diff --git a/fs/namei.c b/fs/namei.c
-index 27d7dc7..3c72fd5 100644
+index 202d358..876010f 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -364,6 +364,7 @@ int deny_write_access(struct file * file)
@@ -37,7 +37,7 @@ index 27d7dc7..3c72fd5 100644
/**
* path_get - get a reference to a path
-@@ -1772,6 +1773,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1773,6 +1774,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
{
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
@@ -46,10 +46,10 @@ index 27d7dc7..3c72fd5 100644
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
-index 7dba2ed..d7570d1 100644
+index d99bcf5..3ec2aa7 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1524,6 +1524,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
@@ -172,7 +172,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 1011423..3bb850b 100644
+index 4ba6d4c..9f64bb8 100644
--- a/security/security.c
+++ b/security/security.c
@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
@@ -233,13 +233,13 @@ index 1011423..3bb850b 100644
{
@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
- return security_ops->inode_permission(inode, mask);
+ return security_ops->inode_permission(inode, mask, 0);
}
+EXPORT_SYMBOL(security_inode_permission);
int security_inode_exec_permission(struct inode *inode, unsigned int flags)
{
-@@ -628,6 +636,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
@@ -247,7 +247,7 @@ index 1011423..3bb850b 100644
int security_file_alloc(struct file *file)
{
-@@ -655,6 +664,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
return ret;
return ima_file_mmap(file, prot);
}