From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752822AbaKQKlI (ORCPT ); Mon, 17 Nov 2014 05:41:08 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:37180 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752505AbaKQKhY (ORCPT ); Mon, 17 Nov 2014 05:37:24 -0500 From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: Mel Gorman , linux-kernel@vger.kernel.org, , Omar Sandoval Subject: [RFC PATCH 3/6] btrfs: don't set ->private on swapcache pages Date: Mon, 17 Nov 2014 02:36:56 -0800 Message-Id: <320c5b270669c235c5513b5f5763a529abcf88dd.1416219974.git.osandov@osandov.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Swapcache pages use ->private to store the swp_entry_t; overwriting it is sure to cause insanity. Signed-off-by: Omar Sandoval --- fs/btrfs/extent_io.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 9b67b37..54b2d00 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2824,6 +2824,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree, static void attach_extent_buffer_page(struct extent_buffer *eb, struct page *page) { + BUG_ON(PageSwapCache(page)); if (!PagePrivate(page)) { SetPagePrivate(page); page_cache_get(page); @@ -2835,6 +2836,7 @@ static void attach_extent_buffer_page(struct extent_buffer *eb, void set_page_extent_mapped(struct page *page) { + BUG_ON(PageSwapCache(page)); if (!PagePrivate(page)) { SetPagePrivate(page); page_cache_get(page); @@ -2903,7 +2905,8 @@ static int __do_readpage(struct extent_io_tree *tree, size_t blocksize = inode->i_sb->s_blocksize; unsigned long this_bio_flag = *bio_flags & EXTENT_BIO_PARENT_LOCKED; - set_page_extent_mapped(page); + if (likely(!PageSwapCache(page))) + set_page_extent_mapped(page); end = page_end; if (!PageUptodate(page)) { -- 2.1.3