Home Home > GIT Browse > stable

Tools

Branches

openSUSE

Upstream

SLE

summaryrefslogtreecommitdiff
authorJan Kara <jack@suse.cz>2010-07-20 12:12:19 (GMT)
committer Jan Kara <jack@suse.cz>2010-07-20 12:12:19 (GMT)
commitaa9b752eb291a58b9f94c701107052de55ef9573 (patch) (unidiff)
treed87f12585c9bfd802f25a7fe8ec7d46597514b37
parent1b471aa6e6cb57da32b7fff608526d2279f75ac0 (diff)
- patches.fixes/novfs-bdi-init.diff: novfs: backing device inforpm-2.6.32.13-0.5
initialization (bnc#623472).
Diffstat (more/less context) (ignore whitespace changes)
-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 3a7a5d5..4a6c83c 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
1------------------------------------------------------------------- 1-------------------------------------------------------------------
2Tue Jul 20 14:12:12 CEST 2010 - jack@suse.de
3
4- patches.fixes/novfs-bdi-init.diff: novfs: backing device info
5 initialization (bnc#623472).
6
7-------------------------------------------------------------------
2Tue Jul 20 12:40:12 CEST 2010 - mhocko@suse.cz 8Tue Jul 20 12:40:12 CEST 2010 - mhocko@suse.cz
3 9
4- patches.fixes/futex-futex_find_get_task-remove-credentails-check.patch: 10- 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 0000000..399139f
--- a/dev/null
+++ b/patches.fixes/novfs-bdi-init.diff
@@ -0,0 +1,53 @@
1From: Sankar P <psankar@novell.com>
2Subject: novfs: backing device info initialization
3References: bnc#623472
4Patch-mainline: no
5
6The patch initializes and destroys the backing device info struct
7for the novfs properly. Fixes an OOPS as well.
8
9Acked-by: Jan Kara <jack@novell.com>
10Acked-by: Sankar P <psankar@novell.com>
11Signed-off-by: Anders Johansson <ajohansson@novell.com>
12
13diff --git a/fs/novfs/inode.c b/fs/novfs/inode.c
14index 2bc9cc0..19e481c 100644
15--- a/fs/novfs/inode.c
16+++ b/fs/novfs/inode.c
17@@ -3980,6 +3980,17 @@ int __init init_novfs(void)
18 inHAX = 0;
19 inHAXTime = get_nanosecond_time();
20
21 +retCode = bdi_init(&novfs_backing_dev_info);
22+
23 +if(!retCode)
24 + retCode = bdi_register(&novfs_backing_dev_info, NULL, "novfs-map");
25 +if (retCode) {
26 + bdi_destroy(&novfs_backing_dev_info);
27 + goto bdi_fail;
28 +}
29+
30 +
31+
32 retCode = novfs_proc_init();
33
34 novfs_profile_init();
35@@ -3995,6 +4006,8 @@ int __init init_novfs(void)
36 novfs_scope_exit();
37 }
38 }
39+
40+bdi_fail:
41 return (retCode);
42 }
43
44@@ -4010,6 +4023,8 @@ void __exit exit_novfs(void)
45 kfree(novfs_current_mnt);
46 novfs_current_mnt = NULL;
47 }
48+
49 +bdi_destroy(&novfs_backing_dev_info);
50 }
51
52 int novfs_lock_inode_cache(struct inode *i)
53
diff --git a/series.conf b/series.conf
index cf2f12b..e3aba21 100644
--- a/series.conf
+++ b/series.conf
@@ -1076,6 +1076,7 @@
1076 patches.fixes/novfs-LFS-initialization 1076 patches.fixes/novfs-LFS-initialization
1077 patches.fixes/novfs-truncate-EIO-fix.patch 1077 patches.fixes/novfs-truncate-EIO-fix.patch
1078 patches.fixes/novfs-overflow-fixes 1078 patches.fixes/novfs-overflow-fixes
1079 patches.fixes/novfs-bdi-init.diff
1079 1080
1080 ######################################################## 1081 ########################################################
1081 # other filesystem stuff 1082 # other filesystem stuff