* + md-check-return-code-of-read_sb_page.patch added to -mm tree
@ 2010-09-08 20:06 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2010-09-08 20:06 UTC (permalink / raw)
To: mm-commits; +Cc: segooon, neilb
The patch titled
md: check return code of read_sb_page
has been added to the -mm tree. Its filename is
md-check-return-code-of-read_sb_page.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: md: check return code of read_sb_page
From: Vasiliy Kulikov <segooon@gmail.com>
Function read_sb_page may return ERR_PTR(...). Check for it.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/md/bitmap.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff -puN drivers/md/bitmap.c~md-check-return-code-of-read_sb_page drivers/md/bitmap.c
--- a/drivers/md/bitmap.c~md-check-return-code-of-read_sb_page
+++ a/drivers/md/bitmap.c
@@ -936,6 +936,7 @@ static int bitmap_init_from_disk(struct
int outofdate;
int ret = -ENOSPC;
void *paddr;
+ struct page *p;
chunks = bitmap->chunks;
file = bitmap->file;
@@ -999,11 +1000,16 @@ static int bitmap_init_from_disk(struct
*/
page = bitmap->sb_page;
offset = sizeof(bitmap_super_t);
- if (!file)
- read_sb_page(bitmap->mddev,
+ if (!file) {
+ p = read_sb_page(bitmap->mddev,
bitmap->mddev->bitmap_info.offset,
page,
index, count);
+ if (IS_ERR(p)) {
+ ret = PTR_ERR(p);
+ goto err;
+ }
+ }
} else if (file) {
page = read_page(file, index, bitmap, count);
offset = 0;
_
Patches currently in -mm which might be from segooon@gmail.com are
linux-next.patch
md-check-return-code-of-read_sb_page.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-09-08 20:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-08 20:06 + md-check-return-code-of-read_sb_page.patch added to -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.