1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:15:00 +02:00

linux/generic: update kernel patch refreshing. Include two missed patches.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23240 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acoul 2010-10-05 09:49:53 +00:00
parent 8a1bafdbe1
commit abcac74a19
5 changed files with 14 additions and 7 deletions

View File

@ -7492,7 +7492,7 @@
+
--- /dev/null
+++ b/fs/mini_fo/super.c
@@ -0,0 +1,281 @@
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 1997-2003 Erez Zadok
+ * Copyright (c) 2001-2003 Stony Brook University
@ -7665,7 +7665,11 @@
+ struct dentry *hidden_d;
+
+ hidden_d = dtohd(d);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ err = statfs_by_dentry(hidden_d, buf);
+#else
+ err = vfs_statfs(hidden_d, buf);
+#endif
+#else
+ super_block_t *hidden_sb;
+

View File

@ -93,7 +93,7 @@
*/
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
@@ -266,10 +266,31 @@ mini_fo_umount_begin(super_block_t *sb)
}
#endif

View File

@ -16,7 +16,7 @@
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
@@ -238,7 +240,7 @@ mini_fo_clear_inode(inode_t *inode)
@@ -242,7 +244,7 @@ mini_fo_clear_inode(inode_t *inode)
* dies.
*/
STATIC void
@ -25,7 +25,7 @@
mini_fo_umount_begin(struct vfsmount *mnt, int flags)
{
struct vfsmount *hidden_mnt;
@@ -290,7 +292,9 @@ struct super_operations mini_fo_sops =
@@ -294,7 +296,9 @@ struct super_operations mini_fo_sops =
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)
write_inode: mini_fo_write_inode,
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */

View File

@ -14,7 +14,7 @@
print_exit_location();
}
@@ -296,11 +299,11 @@ struct super_operations mini_fo_sops =
@@ -300,11 +303,11 @@ struct super_operations mini_fo_sops =
put_inode: mini_fo_put_inode,
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */
#if defined(FIST_DEBUG) || defined(FIST_FILTER_SCA)

View File

@ -21,9 +21,12 @@
+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
--- a/drivers/leds/ledtrig-netdev.c
+++ b/drivers/leds/ledtrig-netdev.c
@@ -309,6 +309,7 @@ static void netdev_trig_timer(unsigned l
@@ -307,8 +307,9 @@ done:
static void netdev_trig_timer(unsigned long arg)
{
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
const struct net_device_stats *dev_stats;
- const struct net_device_stats *dev_stats;
+ struct rtnl_link_stats64 *dev_stats;
unsigned new_activity;
+ struct rtnl_link_stats64 temp;