pramfs: XIP operations
PATCH v2 10/16 pramfs: XIP operations
From: Marco Stornelli <[email protected]>
XIP operations.
---
fs/pramfs/xip.c +90 -0
@@ -0,0 +1,90 @@ +/* +* FILE NAME fs/pramfs/xip.c +* +* BRIEF DESCRIPTION +* +* XIP operations. +* +* Copyright 2009-2010 Marco Stornelli <[email protected]> +* This file is licensed under the terms of the GNU General Public +* License version 2. This program is licensed "as is" without any +* warranty of any kind, whether express or implied. +*/ + +#include <linux/mm.h> +#include <linux/fs.h> +#include <linux/genhd.h> +#include <linux/buffer_head.h> +#include "pram.h" +#include "xip.h" + +static int pram_find_and_alloc_blocks (struct inode *inode,sector_t iblock, +sector_t *data_block,int create) +{ +int err = -EIO ; +u64 block; + +mutex_lock (&PRAM_I (inode)->truncate_lock); + + block =pram_find_data_block (inode, iblock); + +if (!block) { +if (!create) { + err = -ENODATA ; + goto err; + } + + err =pram_alloc_blocks (inode, iblock,1 ); +if (err) + goto err; + + block =pram_find_data_block (inode, iblock); +if (!block) { + err = -ENODATA ; + goto err; + } + } + + *data_block = block; + err =0 ; + + err: +mutex_unlock (&PRAM_I (inode)->truncate_lock); +return err; +} + + +static int __pram_get_block (struct inode *inode,pgoff_t pgoff,int create, +sector_t *result) +{ +int rc =0 ; +sector_t iblock; + +/* find starting block number to access */ + iblock = (sector_t )pgoff << (PAGE_CACHE_SHIFT - inode->i_blkbits); + + rc =pram_find_and_alloc_blocks (inode, iblock, result, create); + +if (rc == -ENODATA ) +BUG_ON (create); + +return rc; +} + +int pram_get_xip_mem (struct address_space *mapping,pgoff_t pgoff,int create, +void **kmem,unsigned long *pfn) +{ +int rc; +sector_t block; + +/* first, retrieve the block */ + rc =__pram_get_block (mapping->host, pgoff, create, &block); +if (rc) + goto exit; + + *kmem =pram_get_block (mapping->host->i_sb, block); + *pfn =page_to_pfn (virt_to_page ((unsigned long )*kmem)); + +exit: +return rc; +}
fs/pramfs/xip.h +24 -0
@@ -0,0 +1,24 @@ +/* +* FILE NAME fs/pramfs/xip.h +* +* BRIEF DESCRIPTION +* +* XIP operations. +* +* Copyright 2009-2010 Marco Stornelli <[email protected]> +* This file is licensed under the terms of the GNU General Public +* License version 2. This program is licensed "as is" without any +* warranty of any kind, whether express or implied. +*/ + +#ifdef CONFIG_PRAMFS_XIP + +int pram_get_xip_mem (struct address_space *,pgoff_t ,int ,void **, +unsigned long *); + +#else + +#define pram_get_xip_mem NULL + +#endif +
Hi,
Quoted 3 lines · Marco Stornelli
diff -Nurp
linux-2.6.36-orig/fs/pramfs/xip.clinux-2.6.36/fs/pramfs/xip.cfs/pramfs/xip.c +0
-0
<snip>
fs/pramfs/xip.c line 27
Quoted 7 lines
fs/pramfs/xip.c +7
-0+static int pram_find_and_alloc_blocks (struct inode *inode,sector_t iblock, +sector_t *data_block,int create) +{ +int err = -EIO ; +u64 block; + +mutex_lock (&PRAM_I (inode)->truncate_lock);
fs/pramfs/xip.c: In function ‘pram_find_and_alloc_blocks’:fs/pramfs/xip.c:27: error: ‘struct pram_inode_vfs’ has no member named ‘truncate_lock’fs/pramfs/xip.c:52: error: ‘struct pram_inode_vfs’ has no member named ‘truncate_lock’
i guess that should be truncate_mutex.
Quoted 15 lines
fs/pramfs/xip.c +15
-0+ + block =pram_find_data_block (inode, iblock); + +if (!block) { +if (!create) { + err = -ENODATA ; + goto err; + } + + err =pram_alloc_blocks (inode, iblock,1 ); +if (err) + goto err; + + block =pram_find_data_block (inode, iblock); +if (!block) {
fs/pramfs/xip.c line 52
Quoted 10 lines
fs/pramfs/xip.c +10
-0+ err = -ENODATA ; + goto err; + } + } + + *data_block = block; + err =0 ; + + err: +mutex_unlock (&PRAM_I (inode)->truncate_lock);
same here
fs/pramfs/xip.c
Quoted 2 lines
fs/pramfs/xip.c +2
-0+return err; +}
Cheers
James
Il 06/11/2010 14:33, James Hogan ha scritto:
Quoted 21 lines
Hi,
Quoted 3 lines · Marco Stornelli
diff -Nurp
linux-2.6.36-orig/fs/pramfs/xip.clinux-2.6.36/fs/pramfs/xip.cfs/pramfs/xip.c +0
-0<snip>
fs/pramfs/xip.c line 27
Quoted 7 lines
fs/pramfs/xip.c +7
-0+static int pram_find_and_alloc_blocks (struct inode *inode,sector_t iblock, +sector_t *data_block,int create) +{ +int err = -EIO ; +u64 block; + +mutex_lock (&PRAM_I (inode)->truncate_lock);
fs/pramfs/xip.c: In function ‘pram_find_and_alloc_blocks’:fs/pramfs/xip.c:27: error: ‘struct pram_inode_vfs’ has no member named ‘truncate_lock’fs/pramfs/xip.c:52: error: ‘struct pram_inode_vfs’ has no member named ‘truncate_lock’
Quoted 2 lines
i guess that should be
truncate_mutex.
Oops, my fault, yes it's truncate_mutex. I'll fix it asap.
Marco