projects / openwrt / staging / yousong.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 000ae30)
add mini_fo fix from #1801
authorFelix Fietkau <nbd@openwrt.org>
Wed, 20 Jun 2007 00:16:41 +0000 (00:16 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 20 Jun 2007 00:16:41 +0000 (00:16 +0000)
SVN-Revision: 7676

target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch patch | blob | history
target/linux/generic-2.6/patches/209-mini_fo.patch patch | blob | history

diff --git a/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch b/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch
index f542fd45c2011a7f801d700940c959fb0e3ac4e9..5da0a31a60da72596a4d59069ee1c8ea39391c29 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/209-mini_fo.patch
@@ -2115,7 +2115,7 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fis
 diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/inode.c
 --- linux-2.6.21.1.old/fs/mini_fo/inode.c      1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.21.1.dev/fs/mini_fo/inode.c      2007-05-26 21:01:26.164329720 +0200
-@@ -0,0 +1,1573 @@
+@@ -0,0 +1,1564 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 + * Copyright (c) 2001-2003 Stony Brook University
@@ -2670,9 +2670,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
 +              down(&hidden_sto_dir_dentry->d_inode->i_sem);
 +#endif
 +
-+              /* avoid destroying the hidden inode if the file is in use */
-+              dget(hidden_sto_dentry);
-+
 +              /* Delete an old WOL file contained in the storage dir */
 +              meta_dentry = lookup_one_len(META_FILENAME, 
 +                                           hidden_sto_dentry, 
@@ -2763,9 +2760,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
 +              down(&hidden_sto_dir_dentry->d_inode->i_sem);
 +#endif
 +
-+              /* avoid destroying the hidden inode if the file is in use */
-+              dget(hidden_sto_dentry);
-+
 +              /* Delete an old WOL file contained in the storage dir */
 +              meta_dentry = lookup_one_len(META_FILENAME, 
 +                                           hidden_sto_dentry, 
@@ -2811,9 +2805,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
 +              down(&hidden_sto_dir_dentry->d_inode->i_sem);
 +#endif
 +
-+              /* avoid destroying the hidden inode if the file is in use */
-+              dget(hidden_sto_dentry);
-+
 +              /* Delete an old WOL file contained in the storage dir */
 +              meta_dentry = lookup_one_len(META_FILENAME, 
 +                                           hidden_sto_dentry, 
diff --git a/target/linux/generic-2.6/patches/209-mini_fo.patch b/target/linux/generic-2.6/patches/209-mini_fo.patch
index 5f354c55bc8c7c073db8b9346cbbac7c7f719ea6..35c9ec2f097ffebbebc061b3e793de01b0656077 100644 (file)
--- a/target/linux/generic-2.6/patches/209-mini_fo.patch
+++ b/target/linux/generic-2.6/patches/209-mini_fo.patch
@@ -2115,7 +2115,7 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/fist.h linux-2.6.21.1.dev/fs/mini_fo/fis
 diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/inode.c
 --- linux-2.6.21.1.old/fs/mini_fo/inode.c      1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.21.1.dev/fs/mini_fo/inode.c      2007-05-26 21:01:26.164329720 +0200
-@@ -0,0 +1,1573 @@
+@@ -0,0 +1,1564 @@
 +/*
 + * Copyright (c) 1997-2003 Erez Zadok
 + * Copyright (c) 2001-2003 Stony Brook University
@@ -2670,9 +2670,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
 +              down(&hidden_sto_dir_dentry->d_inode->i_sem);
 +#endif
 +
-+              /* avoid destroying the hidden inode if the file is in use */
-+              dget(hidden_sto_dentry);
-+
 +              /* Delete an old WOL file contained in the storage dir */
 +              meta_dentry = lookup_one_len(META_FILENAME, 
 +                                           hidden_sto_dentry, 
@@ -2763,9 +2760,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
 +              down(&hidden_sto_dir_dentry->d_inode->i_sem);
 +#endif
 +
-+              /* avoid destroying the hidden inode if the file is in use */
-+              dget(hidden_sto_dentry);
-+
 +              /* Delete an old WOL file contained in the storage dir */
 +              meta_dentry = lookup_one_len(META_FILENAME, 
 +                                           hidden_sto_dentry, 
@@ -2811,9 +2805,6 @@ diff -urN linux-2.6.21.1.old/fs/mini_fo/inode.c linux-2.6.21.1.dev/fs/mini_fo/in
 +              down(&hidden_sto_dir_dentry->d_inode->i_sem);
 +#endif
 +
-+              /* avoid destroying the hidden inode if the file is in use */
-+              dget(hidden_sto_dentry);
-+
 +              /* Delete an old WOL file contained in the storage dir */
 +              meta_dentry = lookup_one_len(META_FILENAME, 
 +                                           hidden_sto_dentry, 
Yousong Zhou staging tree