From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755616Ab0IVVCu (ORCPT ); Wed, 22 Sep 2010 17:02:50 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:51302 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755597Ab0IVVCs (ORCPT ); Wed, 22 Sep 2010 17:02:48 -0400 Date: Wed, 22 Sep 2010 14:00:13 -0700 From: Dan Magenheimer To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, jeremy@goop.org, hughd@google.com, ngupta@vflare.org, JBeulich@novell.com, chris.mason@oracle.com, kurt.hackel@oracle.com, dave.mccracken@oracle.com, npiggin@kernel.dk, akpm@linux-foundation.org, riel@redhat.com, mel@csn.ul.ie, yinghan@google.com, gthelen@google.com, konrad.wilk@oracle.com Subject: [PATCH V3 1/4] Frontswap: swap data structure changes Message-ID: <20100922210013.GA27324@ca-server1.us.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [PATCH V3 1/4] Frontswap: swap data structure changes Core swap data structures are needed by frontswap.c but we don't need to expose them to the dozens of files that include swap.h so create a new swapfile.h just to extern-ify these. Add frontswap-related elements to swap_info_struct. Don't tie these to CONFIG_FRONTSWAP to avoid unnecessary clutter around various frontswap hooks. Signed-off-by: Dan Magenheimer Diffstat: swap.h | 2 ++ swapfile.h | 13 +++++++++++++ 2 files changed, 15 insertions(+) --- linux-2.6.36-rc5/include/linux/swapfile.h 1969-12-31 17:00:00.000000000 -0700 +++ linux-2.6.36-rc5-frontswap/include/linux/swapfile.h 2010-09-21 13:58:02.000000000 -0600 @@ -0,0 +1,13 @@ +#ifndef _LINUX_SWAPFILE_H +#define _LINUX_SWAPFILE_H + +/* + * these were static in swapfile.c but frontswap.c needs them and we don't + * want to expose them to the dozens of source files that include swap.h + */ +extern spinlock_t swap_lock; +extern struct swap_list_t swap_list; +extern struct swap_info_struct *swap_info[]; +extern int try_to_unuse(unsigned int, bool, unsigned long); + +#endif /* _LINUX_SWAPFILE_H */ --- linux-2.6.36-rc5/include/linux/swap.h 2010-09-20 17:56:53.000000000 -0600 +++ linux-2.6.36-rc5-frontswap/include/linux/swap.h 2010-09-21 14:00:11.000000000 -0600 @@ -185,6 +185,8 @@ struct swap_info_struct { struct block_device *bdev; /* swap device or bdev of swap file */ struct file *swap_file; /* seldom referenced */ unsigned int old_block_size; /* seldom referenced */ + unsigned long *frontswap_map; /* frontswap in-use, one bit per page */ + unsigned int frontswap_pages; /* frontswap pages in-use counter */ }; struct swap_list_t {