qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:37:10 +02:00
Code

resync 2.6.31 patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17991 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2009-10-08 09:13:14 +00:00
parent 3138a26410
commit 195e79a202
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/generic-2.6/patches-2.6.31/233-jffs2_whiteout_support.patch
View File

@ -1,6 +1,6 @@
--- a/fs/jffs2/dir.c --- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@ static int jffs2_mknod (struct inode *,s
static int jffs2_rename (struct inode *, struct dentry *, static int jffs2_rename (struct inode *, struct dentry *,
struct inode *, struct dentry *); struct inode *, struct dentry *);
@ -10,7 +10,7 @@
const struct file_operations jffs2_dir_operations = const struct file_operations jffs2_dir_operations =
{ {
.read = generic_read_dir, .read = generic_read_dir,
@@ -55,6 +58,8 @@ @@ -55,6 +58,8 @@ const struct inode_operations jffs2_dir_
.rmdir = jffs2_rmdir, .rmdir = jffs2_rmdir,
.mknod = jffs2_mknod, .mknod = jffs2_mknod,
.rename = jffs2_rename, .rename = jffs2_rename,
@ -19,7 +19,7 @@
.permission = jffs2_permission, .permission = jffs2_permission,
.setattr = jffs2_setattr, .setattr = jffs2_setattr,
.setxattr = jffs2_setxattr, .setxattr = jffs2_setxattr,
@@ -98,8 +103,21 @@ @@ -98,8 +103,21 @@ static struct dentry *jffs2_lookup(struc
fd = fd_list; fd = fd_list;
} }
} }
@ -43,7 +43,7 @@
mutex_unlock(&dir_f->sem); mutex_unlock(&dir_f->sem);
if (ino) { if (ino) {
inode = jffs2_iget(dir_i->i_sb, ino); inode = jffs2_iget(dir_i->i_sb, ino);
@@ -155,7 +173,9 @@ @@ -155,7 +173,9 @@ static int jffs2_readdir(struct file *fi
fd->name, fd->ino, fd->type, curofs, offset)); fd->name, fd->ino, fd->type, curofs, offset));
continue; continue;
} }
@ -54,7 +54,7 @@
D2(printk(KERN_DEBUG "Skipping deletion dirent \"%s\"\n", fd->name)); D2(printk(KERN_DEBUG "Skipping deletion dirent \"%s\"\n", fd->name));
offset++; offset++;
continue; continue;
@@ -498,6 +518,11 @@ @@ -498,6 +518,11 @@ static int jffs2_mkdir (struct inode *di
return PTR_ERR(inode); return PTR_ERR(inode);
} }
@ -66,7 +66,7 @@
inode->i_op = &jffs2_dir_inode_operations; inode->i_op = &jffs2_dir_inode_operations;
inode->i_fop = &jffs2_dir_operations; inode->i_fop = &jffs2_dir_operations;
@@ -779,6 +804,82 @@ @@ -779,6 +804,82 @@ static int jffs2_mknod (struct inode *di
return 0; return 0;
} }
@ -151,7 +151,7 @@
{ {
--- a/fs/jffs2/fs.c --- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c
@@ -301,6 +301,10 @@ @@ -301,6 +301,10 @@ struct inode *jffs2_iget(struct super_bl
inode->i_op = &jffs2_dir_inode_operations; inode->i_op = &jffs2_dir_inode_operations;
inode->i_fop = &jffs2_dir_operations; inode->i_fop = &jffs2_dir_operations;
@ -164,7 +164,7 @@
case S_IFREG: case S_IFREG:
--- a/fs/jffs2/super.c --- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c +++ b/fs/jffs2/super.c
@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@ static int jffs2_fill_super(struct super
sb->s_op = &jffs2_super_operations; sb->s_op = &jffs2_super_operations;
sb->s_export_op = &jffs2_export_ops; sb->s_export_op = &jffs2_export_ops;

6
target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch
View File

@ -1,6 +1,6 @@
--- a/fs/union.c --- a/fs/union.c
+++ b/fs/union.c +++ b/fs/union.c
@@ -842,10 +842,8 @@ @@ -842,10 +842,8 @@ static int union_copyup_dir_one(void *bu
/* Lookup this entry in the topmost directory */ /* Lookup this entry in the topmost directory */
dentry = lookup_one_len(name, topmost_dentry, namlen); dentry = lookup_one_len(name, topmost_dentry, namlen);
@ -12,7 +12,7 @@
/* /*
* If the entry already exists, one of the following is true: * If the entry already exists, one of the following is true:
@@ -857,7 +855,6 @@ @@ -857,7 +855,6 @@ static int union_copyup_dir_one(void *bu
*/ */
if (dentry->d_inode || d_is_whiteout(dentry) || if (dentry->d_inode || d_is_whiteout(dentry) ||
d_is_fallthru(dentry)) { d_is_fallthru(dentry)) {
@ -20,7 +20,7 @@
goto out_dput; goto out_dput;
} }
@@ -867,7 +864,6 @@ @@ -867,7 +864,6 @@ static int union_copyup_dir_one(void *bu
* used, so each file system must implement its own way of * used, so each file system must implement its own way of
* storing a fallthru entry. * storing a fallthru entry.
*/ */