diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-05 00:54:09 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-05 00:54:09 (GMT) |
commit | ec4883b015c3212f6f6d04fb2ff45f528492f598 (patch) | |
tree | 0e393eb198a35a90adafcd8129564d0173aafad4 /include/linux/fs.h | |
parent | 464cf177df7727efcc5506322fc5d0c8b896f545 (diff) | |
parent | 0477d24e2a87a9077b62298b01b031929f5cf2a2 (diff) | |
download | linux-fsl-qoriq-ec4883b015c3212f6f6d04fb2ff45f528492f598.tar.xz |
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/fs.h')
-rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7cf0c54..b3ae77c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -938,6 +938,7 @@ struct super_block { struct list_head s_files; struct block_device *s_bdev; + struct mtd_info *s_mtd; struct list_head s_instances; struct quota_info s_dquot; /* Diskquota specific options */ |