Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932104Ab0LPSE5 (ORCPT ); Thu, 16 Dec 2010 13:04:57 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:55997 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932086Ab0LPSEv (ORCPT ); Thu, 16 Dec 2010 13:04:51 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=R8ay3kAPzcgWbKgJa8g1LKRiMsL2PL9uKe8917LlD4rEKgTbqUPDx84nC3YGnKuN42 vrq5cybxkeM15Uwsm3siYGTD48M1UNmLv0I3a4kRsOatQkM+ZLwyKT4LYmY4YAoD3m98 Qw/ni33PYc7hKUTJiUQ2pzLbGyVO9TsK543vo= Message-ID: <4D0A53F5.1000807@gmail.com> Date: Thu, 16 Dec 2010 19:01:25 +0100 From: Marco Stornelli User-Agent: Mozilla/5.0 (X11; U; Linux i686; it; rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11 MIME-Version: 1.0 To: Linux Kernel CC: Linux Embedded , Linux FS Devel , Tim Bird , Andrew Morton Subject: [PATCH 10/16 v5] pramfs: xip operations Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3398 Lines: 130 From: Marco Stornelli XIP operations. Signed-off-by: Marco Stornelli --- diff -Nurp linux-2.6.36-orig/fs/pramfs/xip.c linux-2.6.36/fs/pramfs/xip.c --- linux-2.6.36-orig/fs/pramfs/xip.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.36/fs/pramfs/xip.c 2010-12-12 18:34:05.000000000 +0100 @@ -0,0 +1,83 @@ +/* + * BRIEF DESCRIPTION + * + * XIP operations. + * + * Copyright 2009-2010 Marco Stornelli + * 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 +#include +#include +#include +#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_mutex); + + 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_mutex); + return err; +} + +static inline int __pram_get_block(struct inode *inode, pgoff_t pgoff, int create, + sector_t *result) +{ + int rc = 0; + + rc = pram_find_and_alloc_blocks(inode, (sector_t)pgoff, 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; +} diff -Nurp linux-2.6.36-orig/fs/pramfs/xip.h linux-2.6.36/fs/pramfs/xip.h --- linux-2.6.36-orig/fs/pramfs/xip.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.36/fs/pramfs/xip.h 2010-11-28 12:37:00.000000000 +0100 @@ -0,0 +1,28 @@ +/* + * BRIEF DESCRIPTION + * + * XIP operations. + * + * Copyright 2009-2010 Marco Stornelli + * 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 *); +static inline int pram_use_xip(struct super_block *sb) +{ + struct pram_sb_info *sbi = (struct pram_sb_info *)sb->s_fs_info; + return sbi->s_mount_opt & PRAM_MOUNT_XIP; +} +#define mapping_is_xip(map) unlikely(map->a_ops->get_xip_mem) + +#else + +#define mapping_is_xip(map) 0 +#define pram_use_xip(sb) 0 +#define pram_get_xip_mem NULL + +#endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/