Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757003Ab1E0TtH (ORCPT ); Fri, 27 May 2011 15:49:07 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:20674 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753327Ab1E0TtD (ORCPT ); Fri, 27 May 2011 15:49:03 -0400 Date: Fri, 27 May 2011 12:48:25 -0700 From: Dan Magenheimer To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, jeremy@goop.org, hughd@google.com, ngupta@vflare.org, konrad.wilk@oracle.com, JBeulich@novell.com, kurt.hackel@oracle.com, npiggin@suse.de, akpm@linux-foundation.org, riel@redhat.com, hannes@cmpxchg.org, matthew@wil.cx, chris.mason@oracle.com, dan.magenheimer@oracle.com Subject: [PATCH V4 1/4] mm: frontswap: swap data structure changes Message-ID: <20110527194824.GA27124@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) X-Source-IP: acsinet22.oracle.com [141.146.126.238] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090201.4DE00013.00C0:SCFMA922111,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2014 Lines: 49 [PATCH V4 1/4] mm: 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.39/include/linux/swapfile.h 1969-12-31 17:00:00.000000000 -0700 +++ linux-2.6.39-frontswap/include/linux/swapfile.h 2011-05-26 15:37:25.200224614 -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.39/include/linux/swap.h 2011-05-18 22:06:34.000000000 -0600 +++ linux-2.6.39-frontswap/include/linux/swap.h 2011-05-26 15:37:25.222179479 -0600 @@ -194,6 +194,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 { -- 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/