diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2015-02-16 18:59:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 20:56:03 -0500 |
| commit | 07642381d5ad800d021bb80842bfebb100b12fc2 (patch) | |
| tree | c7d48ae35632ccb7fb7bbf0646c1fac47b4a8342 | |
| parent | ed87e9202035c8564472f5d84e7d5e10f1014029 (diff) | |
ext2: remove xip.c and xip.h
These files are now empty, so delete them
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Boaz Harrosh <boaz@plexistor.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/ext2/Makefile | 1 | ||||
| -rw-r--r-- | fs/ext2/inode.c | 1 | ||||
| -rw-r--r-- | fs/ext2/namei.c | 1 | ||||
| -rw-r--r-- | fs/ext2/super.c | 1 | ||||
| -rw-r--r-- | fs/ext2/xip.c | 15 | ||||
| -rw-r--r-- | fs/ext2/xip.h | 16 |
6 files changed, 0 insertions, 35 deletions
diff --git a/fs/ext2/Makefile b/fs/ext2/Makefile index f42af45cfd88..445b0e996a12 100644 --- a/fs/ext2/Makefile +++ b/fs/ext2/Makefile | |||
| @@ -10,4 +10,3 @@ ext2-y := balloc.o dir.o file.o ialloc.o inode.o \ | |||
| 10 | ext2-$(CONFIG_EXT2_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o | 10 | ext2-$(CONFIG_EXT2_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o |
| 11 | ext2-$(CONFIG_EXT2_FS_POSIX_ACL) += acl.o | 11 | ext2-$(CONFIG_EXT2_FS_POSIX_ACL) += acl.o |
| 12 | ext2-$(CONFIG_EXT2_FS_SECURITY) += xattr_security.o | 12 | ext2-$(CONFIG_EXT2_FS_SECURITY) += xattr_security.o |
| 13 | ext2-$(CONFIG_EXT2_FS_XIP) += xip.o | ||
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index cba38331a124..154cbcf30f35 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/aio.h> | 34 | #include <linux/aio.h> |
| 35 | #include "ext2.h" | 35 | #include "ext2.h" |
| 36 | #include "acl.h" | 36 | #include "acl.h" |
| 37 | #include "xip.h" | ||
| 38 | #include "xattr.h" | 37 | #include "xattr.h" |
| 39 | 38 | ||
| 40 | static int __ext2_write_inode(struct inode *inode, int do_sync); | 39 | static int __ext2_write_inode(struct inode *inode, int do_sync); |
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index 846c356af7ca..7ca803f408b0 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include "ext2.h" | 35 | #include "ext2.h" |
| 36 | #include "xattr.h" | 36 | #include "xattr.h" |
| 37 | #include "acl.h" | 37 | #include "acl.h" |
| 38 | #include "xip.h" | ||
| 39 | 38 | ||
| 40 | static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode) | 39 | static inline int ext2_add_nondir(struct dentry *dentry, struct inode *inode) |
| 41 | { | 40 | { |
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 83c5d51b8ede..50342583db1f 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include "ext2.h" | 35 | #include "ext2.h" |
| 36 | #include "xattr.h" | 36 | #include "xattr.h" |
| 37 | #include "acl.h" | 37 | #include "acl.h" |
| 38 | #include "xip.h" | ||
| 39 | 38 | ||
| 40 | static void ext2_sync_super(struct super_block *sb, | 39 | static void ext2_sync_super(struct super_block *sb, |
| 41 | struct ext2_super_block *es, int wait); | 40 | struct ext2_super_block *es, int wait); |
diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c deleted file mode 100644 index 66ca1133827e..000000000000 --- a/fs/ext2/xip.c +++ /dev/null | |||
| @@ -1,15 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/fs/ext2/xip.c | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 IBM Corporation | ||
| 5 | * Author: Carsten Otte (cotte@de.ibm.com) | ||
| 6 | */ | ||
| 7 | |||
| 8 | #include <linux/mm.h> | ||
| 9 | #include <linux/fs.h> | ||
| 10 | #include <linux/genhd.h> | ||
| 11 | #include <linux/buffer_head.h> | ||
| 12 | #include <linux/blkdev.h> | ||
| 13 | #include "ext2.h" | ||
| 14 | #include "xip.h" | ||
| 15 | |||
diff --git a/fs/ext2/xip.h b/fs/ext2/xip.h deleted file mode 100644 index 87eeb0460e8c..000000000000 --- a/fs/ext2/xip.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * linux/fs/ext2/xip.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 IBM Corporation | ||
| 5 | * Author: Carsten Otte (cotte@de.ibm.com) | ||
| 6 | */ | ||
| 7 | |||
| 8 | #ifdef CONFIG_EXT2_FS_XIP | ||
| 9 | static inline int ext2_use_xip (struct super_block *sb) | ||
| 10 | { | ||
| 11 | struct ext2_sb_info *sbi = EXT2_SB(sb); | ||
| 12 | return (sbi->s_mount_opt & EXT2_MOUNT_XIP); | ||
| 13 | } | ||
| 14 | #else | ||
| 15 | #define ext2_use_xip(sb) 0 | ||
| 16 | #endif | ||
