Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed87e920 authored Feb 16, 2015 by Matthew Wilcox Committed by Linus Torvalds Feb 16, 2015

ext2: remove ext2_use_xip

Replace ext2_use_xip() with test_opt(XIP) which expands to the same code

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>

parent 0de4830f

fs/ext2/ext2.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -380,7 +380,11 @@ struct ext2_inode {
		#define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */
		#define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */
		#define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */
		#ifdef CONFIG_FS_XIP
		#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */
		#else
		#define EXT2_MOUNT_XIP 0
		#endif
		#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */
		#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */
		#define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */

fs/ext2/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1394,7 +1394,7 @@ struct inode ext2_iget (struct super_block sb, unsigned long ino)

		if (S_ISREG(inode->i_mode)) {
		inode->i_op = &ext2_file_inode_operations;
		if (ext2_use_xip(inode->i_sb)) {
		if (test_opt(inode->i_sb, XIP)) {
		inode->i_mapping->a_ops = &ext2_aops_xip;
		inode->i_fop = &ext2_xip_file_operations;
		} else if (test_opt(inode->i_sb, NOBH)) {

fs/ext2/namei.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ static int ext2_create (struct inode * dir, struct dentry * dentry, umode_t mode
		return PTR_ERR(inode);

		inode->i_op = &ext2_file_inode_operations;
		if (ext2_use_xip(inode->i_sb)) {
		if (test_opt(inode->i_sb, XIP)) {
		inode->i_mapping->a_ops = &ext2_aops_xip;
		inode->i_fop = &ext2_xip_file_operations;
		} else if (test_opt(inode->i_sb, NOBH)) {
		@@ -126,7 +126,7 @@ static int ext2_tmpfile(struct inode dir, struct dentry dentry, umode_t mode)
		return PTR_ERR(inode);

		inode->i_op = &ext2_file_inode_operations;
		if (ext2_use_xip(inode->i_sb)) {
		if (test_opt(inode->i_sb, XIP)) {
		inode->i_mapping->a_ops = &ext2_aops_xip;
		inode->i_fop = &ext2_xip_file_operations;
		} else if (test_opt(inode->i_sb, NOBH)) {