[PATCH] xip cleanups

Christoph Hellwig
2005-06-28T12:02:43Z

adjust to kernel style and remove some unneeded NULL checks

Index: linux-2.6/fs/ext2/xip.c
===================================================================
--- linux-2.6.orig/fs/ext2/xip.c 2005-06-26 13:26:24.000000000 +0200
+++ linux-2.6/fs/ext2/xip.c 2005-06-26 13:30:39.000000000 +0200
@@ -15,42 +15,39 @@
#include "xip.h"

static inline int
-__inode_direct_access(struct inode *inode, sector_t sector, unsigned long *data) {
+__inode_direct_access(struct inode *inode, sector_t sector, unsigned long *data)
+{
BUG_ON(!inode->i_sb->s_bdev->bd_disk->fops->direct_access);
return inode->i_sb->s_bdev->bd_disk->fops
->direct_access(inode->i_sb->s_bdev,sector,data);
}

int
-ext2_clear_xip_target(struct inode *inode, int block) {
- sector_t sector = block*(PAGE_SIZE/512);
+ext2_clear_xip_target(struct inode *inode, int block)
+{
+ sector_t sector = block * (PAGE_SIZE/512);
unsigned long data;
int rc;

rc = __inode_direct_access(inode, sector, &data);
- if (rc)
- return rc;
- clear_page((void*)data);
- return 0;
+ if (!rc)
+ clear_page(data);
+ return rc;
}

void ext2_xip_verify_sb(struct super_block *sb)
{
struct ext2_sb_info *sbi = EXT2_SB(sb);

- if ((sbi->s_mount_opt & EXT2_MOUNT_XIP)) {
- if ((sb->s_bdev == NULL) ||
- sb->s_bdev->bd_disk == NULL ||
- sb->s_bdev->bd_disk->fops == NULL ||
- sb->s_bdev->bd_disk->fops->direct_access == NULL) {
- sbi->s_mount_opt &= (~EXT2_MOUNT_XIP);
- ext2_warning(sb, __FUNCTION__,
- "ignoring xip option - not supported by bdev");
- }
+ if ((sbi->s_mount_opt & EXT2_MOUNT_XIP) &&
+ !sb->s_bdev->bd_disk->fops->direct_access) {
+ sbi->s_mount_opt &= ~EXT2_MOUNT_XIP;
+ ext2_warning(sb, __FUNCTION__,
+ "ignoring xip option - not supported by bdev");
}
}

-struct page*
+struct page *
ext2_get_xip_page(struct address_space *mapping, sector_t blockno,
int create)
{
@@ -60,7 +57,7 @@

tmp.b_state = 0;
tmp.b_blocknr = 0;
- rc = ext2_get_block(mapping->host, blockno/(PAGE_SIZE/512) , &tmp,
+ rc = ext2_get_block(mapping->host, blockno/(PAGE_SIZE/512), &tmp,
create);
if (rc)
return ERR_PTR(rc);
@@ -71,7 +68,7 @@
}

rc = __inode_direct_access
- (mapping->host,tmp.b_blocknr*(PAGE_SIZE/512) ,&data);
+ (mapping->host,tmp.b_blocknr * (PAGE_SIZE/512), &data);
if (rc)
return ERR_PTR(rc);