diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 20:54:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 20:54:09 -0400 |
commit | ec4883b015c3212f6f6d04fb2ff45f528492f598 (patch) | |
tree | 0e393eb198a35a90adafcd8129564d0173aafad4 /include/linux | |
parent | 464cf177df7727efcc5506322fc5d0c8b896f545 (diff) | |
parent | 0477d24e2a87a9077b62298b01b031929f5cf2a2 (diff) |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6:
[JFFS2] Fix obsoletion of metadata nodes in jffs2_add_tn_to_tree()
[MTD] Fix error checking after get_mtd_device() in get_sb_mtd functions
[JFFS2] Fix buffer length calculations in jffs2_get_inode_nodes()
[JFFS2] Fix potential memory leak of dead xattrs on unmount.
[JFFS2] Fix BUG() caused by failing to discard xattrs on deleted files.
[MTD] generalise the handling of MTD-specific superblocks
[MTD] [MAPS] don't force uclinux mtd map to be root dev
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fs.h | 1 | ||||
-rw-r--r-- | include/linux/mtd/super.h | 30 |
2 files changed, 31 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7cf0c54a46a7..b3ae77cccbb6 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -938,6 +938,7 @@ struct super_block { | |||
938 | struct list_head s_files; | 938 | struct list_head s_files; |
939 | 939 | ||
940 | struct block_device *s_bdev; | 940 | struct block_device *s_bdev; |
941 | struct mtd_info *s_mtd; | ||
941 | struct list_head s_instances; | 942 | struct list_head s_instances; |
942 | struct quota_info s_dquot; /* Diskquota specific options */ | 943 | struct quota_info s_dquot; /* Diskquota specific options */ |
943 | 944 | ||
diff --git a/include/linux/mtd/super.h b/include/linux/mtd/super.h new file mode 100644 index 000000000000..4016dd6fe336 --- /dev/null +++ b/include/linux/mtd/super.h | |||
@@ -0,0 +1,30 @@ | |||
1 | /* MTD-based superblock handling | ||
2 | * | ||
3 | * Copyright © 2006 Red Hat, Inc. All Rights Reserved. | ||
4 | * Written by David Howells (dhowells@redhat.com) | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version | ||
9 | * 2 of the License, or (at your option) any later version. | ||
10 | */ | ||
11 | |||
12 | #ifndef __MTD_SUPER_H__ | ||
13 | #define __MTD_SUPER_H__ | ||
14 | |||
15 | #ifdef __KERNEL__ | ||
16 | |||
17 | #include <linux/mtd/mtd.h> | ||
18 | #include <linux/fs.h> | ||
19 | #include <linux/mount.h> | ||
20 | |||
21 | extern int get_sb_mtd(struct file_system_type *fs_type, int flags, | ||
22 | const char *dev_name, void *data, | ||
23 | int (*fill_super)(struct super_block *, void *, int), | ||
24 | struct vfsmount *mnt); | ||
25 | extern void kill_mtd_super(struct super_block *sb); | ||
26 | |||
27 | |||
28 | #endif /* __KERNEL__ */ | ||
29 | |||
30 | #endif /* __MTD_SUPER_H__ */ | ||