diff options
author | Artem Bityutskiy <dedekind@infradead.org> | 2006-10-11 07:52:47 -0400 |
---|---|---|
committer | Artem Bityutskiy <dedekind@infradead.org> | 2006-11-29 10:06:38 -0500 |
commit | 9c74034f8fc5d93fbe5656421cbbdc4c76ddda28 (patch) | |
tree | e5a205e124c0e42899743d765598f82a228156c2 /fs/jffs2 | |
parent | 9fe912cea32aec18f860c95e8574410b5892481b (diff) |
[MTD] return error code from get_mtd_device()
get_mtd_device() returns NULL in case of any failure. Teach it to return an
error code instead. Fix all users as well.
Signed-off-by: Artem Bityutskiy <dedekind@infradead.org>
Diffstat (limited to 'fs/jffs2')
-rw-r--r-- | fs/jffs2/super.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index bc4b8106a490..590f60a897c1 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/list.h> | 18 | #include <linux/list.h> |
19 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
20 | #include <linux/err.h> | ||
20 | #include <linux/mount.h> | 21 | #include <linux/mount.h> |
21 | #include <linux/jffs2.h> | 22 | #include <linux/jffs2.h> |
22 | #include <linux/pagemap.h> | 23 | #include <linux/pagemap.h> |
@@ -184,9 +185,9 @@ static int jffs2_get_sb_mtdnr(struct file_system_type *fs_type, | |||
184 | struct mtd_info *mtd; | 185 | struct mtd_info *mtd; |
185 | 186 | ||
186 | mtd = get_mtd_device(NULL, mtdnr); | 187 | mtd = get_mtd_device(NULL, mtdnr); |
187 | if (!mtd) { | 188 | if (IS_ERR(mtd)) { |
188 | D1(printk(KERN_DEBUG "jffs2: MTD device #%u doesn't appear to exist\n", mtdnr)); | 189 | D1(printk(KERN_DEBUG "jffs2: MTD device #%u doesn't appear to exist\n", mtdnr)); |
189 | return -EINVAL; | 190 | return PTR_ERR(mtd); |
190 | } | 191 | } |
191 | 192 | ||
192 | return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt); | 193 | return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt); |
@@ -221,7 +222,7 @@ static int jffs2_get_sb(struct file_system_type *fs_type, | |||
221 | D1(printk(KERN_DEBUG "jffs2_get_sb(): mtd:%%s, name \"%s\"\n", dev_name+4)); | 222 | D1(printk(KERN_DEBUG "jffs2_get_sb(): mtd:%%s, name \"%s\"\n", dev_name+4)); |
222 | for (mtdnr = 0; mtdnr < MAX_MTD_DEVICES; mtdnr++) { | 223 | for (mtdnr = 0; mtdnr < MAX_MTD_DEVICES; mtdnr++) { |
223 | mtd = get_mtd_device(NULL, mtdnr); | 224 | mtd = get_mtd_device(NULL, mtdnr); |
224 | if (mtd) { | 225 | if (!IS_ERR(mtd)) { |
225 | if (!strcmp(mtd->name, dev_name+4)) | 226 | if (!strcmp(mtd->name, dev_name+4)) |
226 | return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt); | 227 | return jffs2_get_sb_mtd(fs_type, flags, dev_name, data, mtd, mnt); |
227 | put_mtd_device(mtd); | 228 | put_mtd_device(mtd); |