From 592b6d6368408800917cb190e6d0388f0c237186 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 18 Feb 2008 13:48:31 +0100
Subject: [PATCH] --- yaml --- r: 85882 b: refs/heads/master c:
 4c54ac62dceecedd82d4a865017bba0b738e2897 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/block_dev.c     | 4 +++-
 trunk/include/linux/fs.h | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 47f05dfe3cc2..20e090a0423a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52ff4cae65b45dcdfa23de09619754d6f380f31e
+refs/heads/master: 4c54ac62dceecedd82d4a865017bba0b738e2897
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 67fe72ce6ac7..8335f0e1b0fb 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -31,6 +31,8 @@ struct bdev_inode {
 	struct inode vfs_inode;
 };
 
+static const struct address_space_operations def_blk_aops;
+
 static inline struct bdev_inode *BDEV_I(struct inode *inode)
 {
 	return container_of(inode, struct bdev_inode, vfs_inode);
@@ -1334,7 +1336,7 @@ static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 	return blkdev_ioctl(file->f_mapping->host, file, cmd, arg);
 }
 
-const struct address_space_operations def_blk_aops = {
+static const struct address_space_operations def_blk_aops = {
 	.readpage	= blkdev_readpage,
 	.writepage	= blkdev_writepage,
 	.sync_page	= block_sync_page,
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 98ffb6ead434..b84b848431f2 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1590,7 +1590,6 @@ extern void bd_set_size(struct block_device *, loff_t size);
 extern void bd_forget(struct inode *inode);
 extern void bdput(struct block_device *);
 extern struct block_device *open_by_devnum(dev_t, unsigned);
-extern const struct address_space_operations def_blk_aops;
 #else
 static inline void bd_forget(struct inode *inode) {}
 #endif