Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2010-07-20 14:12:19 +0200
committerJan Kara <jack@suse.cz>2010-07-20 14:12:19 +0200
commitaa9b752eb291a58b9f94c701107052de55ef9573 (patch)
treed87f12585c9bfd802f25a7fe8ec7d46597514b37
parent1b471aa6e6cb57da32b7fff608526d2279f75ac0 (diff)
- patches.fixes/novfs-bdi-init.diff: novfs: backing device inforpm-2.6.32.13-0.5
initialization (bnc#623472).
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.fixes/novfs-bdi-init.diff53
-rw-r--r--series.conf1
3 files changed, 60 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 3a7a5d5f93..4a6c83c453 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jul 20 14:12:12 CEST 2010 - jack@suse.de
+
+- patches.fixes/novfs-bdi-init.diff: novfs: backing device info
+ initialization (bnc#623472).
+
+-------------------------------------------------------------------
Tue Jul 20 12:40:12 CEST 2010 - mhocko@suse.cz
- patches.fixes/futex-futex_find_get_task-remove-credentails-check.patch:
diff --git a/patches.fixes/novfs-bdi-init.diff b/patches.fixes/novfs-bdi-init.diff
new file mode 100644
index 0000000000..399139f672
--- /dev/null
+++ b/patches.fixes/novfs-bdi-init.diff
@@ -0,0 +1,53 @@
+From: Sankar P <psankar@novell.com>
+Subject: novfs: backing device info initialization
+References: bnc#623472
+Patch-mainline: no
+
+The patch initializes and destroys the backing device info struct
+for the novfs properly. Fixes an OOPS as well.
+
+Acked-by: Jan Kara <jack@novell.com>
+Acked-by: Sankar P <psankar@novell.com>
+Signed-off-by: Anders Johansson <ajohansson@novell.com>
+
+diff --git a/fs/novfs/inode.c b/fs/novfs/inode.c
+index 2bc9cc0..19e481c 100644
+--- a/fs/novfs/inode.c
++++ b/fs/novfs/inode.c
+@@ -3980,6 +3980,17 @@ int __init init_novfs(void)
+ inHAX = 0;
+ inHAXTime = get_nanosecond_time();
+
++ retCode = bdi_init(&novfs_backing_dev_info);
++
++ if(!retCode)
++ retCode = bdi_register(&novfs_backing_dev_info, NULL, "novfs-map");
++ if (retCode) {
++ bdi_destroy(&novfs_backing_dev_info);
++ goto bdi_fail;
++ }
++
++
++
+ retCode = novfs_proc_init();
+
+ novfs_profile_init();
+@@ -3995,6 +4006,8 @@ int __init init_novfs(void)
+ novfs_scope_exit();
+ }
+ }
++
++bdi_fail:
+ return (retCode);
+ }
+
+@@ -4010,6 +4023,8 @@ void __exit exit_novfs(void)
+ kfree(novfs_current_mnt);
+ novfs_current_mnt = NULL;
+ }
++
++ bdi_destroy(&novfs_backing_dev_info);
+ }
+
+ int novfs_lock_inode_cache(struct inode *i)
+
diff --git a/series.conf b/series.conf
index cf2f12b745..e3aba21af4 100644
--- a/series.conf
+++ b/series.conf
@@ -1076,6 +1076,7 @@
patches.fixes/novfs-LFS-initialization
patches.fixes/novfs-truncate-EIO-fix.patch
patches.fixes/novfs-overflow-fixes
+ patches.fixes/novfs-bdi-init.diff
########################################################
# other filesystem stuff