OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...
[uclinux-h8/linux.git]
/
fs
/
block_dev.c
diff --git
a/fs/block_dev.c
b/fs/block_dev.c
index
054ef1b
..
b155d32
100644
(file)
--- a/
fs/block_dev.c
+++ b/
fs/block_dev.c
@@
-14,6
+14,7
@@
#include <linux/device_cgroup.h>
#include <linux/highmem.h>
#include <linux/blkdev.h>
#include <linux/device_cgroup.h>
#include <linux/highmem.h>
#include <linux/blkdev.h>
+#include <linux/backing-dev.h>
#include <linux/module.h>
#include <linux/blkpg.h>
#include <linux/magic.h>
#include <linux/module.h>
#include <linux/blkpg.h>
#include <linux/magic.h>
@@
-546,7
+547,8
@@
static struct file_system_type bd_type = {
.kill_sb = kill_anon_super,
};
.kill_sb = kill_anon_super,
};
-static struct super_block *blockdev_superblock __read_mostly;
+struct super_block *blockdev_superblock __read_mostly;
+EXPORT_SYMBOL_GPL(blockdev_superblock);
void __init bdev_cache_init(void)
{
void __init bdev_cache_init(void)
{
@@
-687,11
+689,6
@@
static struct block_device *bd_acquire(struct inode *inode)
return bdev;
}
return bdev;
}
-int sb_is_blkdev_sb(struct super_block *sb)
-{
- return sb == blockdev_superblock;
-}
-
/* Call when you free inode */
void bd_forget(struct inode *inode)
/* Call when you free inode */
void bd_forget(struct inode *inode)