Correct patch for AUFS2 2.6.35.*

svn path=/nixpkgs/trunk/; revision=23498
This commit is contained in:
Michael Raskin 2010-08-29 10:37:58 +00:00
parent ce73a758aa
commit a73c3a96e6

View File

@ -1,7 +1,3 @@
From:
http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-base.patch;h=d90958dc45a6beb48836e9bf37847abbabed6854;hb=aufs2-35
http://git.c3sl.ufpr.br/gitweb?p=aufs/aufs2-standalone.git;a=blob;f=aufs2-standalone.patch;h=e1ae93d5f2073505e15739cf195d016880b064e6;hb=aufs2-35
aufs2 base patch for linux-2.6.35 aufs2 base patch for linux-2.6.35
diff --git a/fs/namei.c b/fs/namei.c diff --git a/fs/namei.c b/fs/namei.c
@ -17,9 +13,7 @@ index 868d0cb..6e92c81 100644
{ {
int err; int err;
@@ -1188,7 +1188,7 @@ static struct dentry *lookup_hash(struct nameidata *nd) @@ -1190,5 +1190,5 @@
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
-static int __lookup_one_len(const char *name, struct qstr *this, -static int __lookup_one_len(const char *name, struct qstr *this,
+int __lookup_one_len(const char *name, struct qstr *this, +int __lookup_one_len(const char *name, struct qstr *this,
@ -83,7 +77,6 @@ index 997c3b4..be9a153 100644
+ unsigned int flags); + unsigned int flags);
+ +
#endif #endif
aufs2 standalone patch for linux-2.6.35 aufs2 standalone patch for linux-2.6.35
diff --git a/fs/namei.c b/fs/namei.c diff --git a/fs/namei.c b/fs/namei.c
@ -356,4 +349,3 @@ index 351942a..6ba84a8 100644
int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
unsigned long prot) unsigned long prot)