mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-22 02:48:08 +01:00
e08f5f76e4
These 210 messages are in several long threads, which is good for testing our threading code, and may be useful just as a larger test corpus in the future.
212 lines
6.8 KiB
Text
212 lines
6.8 KiB
Text
From: Suresh Jayaraman <sjayaraman@suse.de>
|
|
Subject: [RFC][PATCH 07/10] cifs: FS-Cache page management
|
|
Date: Tue, 22 Jun 2010 20:53:48 +0530
|
|
Lines: 175
|
|
Message-ID: <1277220228-3635-1-git-send-email-sjayaraman@suse.de>
|
|
References: <yes>
|
|
Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
|
|
linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>
|
|
To: Steve French <smfrench@gmail.com>
|
|
X-From: linux-kernel-owner@vger.kernel.org Tue Jun 22 17:44:27 2010
|
|
Return-path: <linux-kernel-owner@vger.kernel.org>
|
|
Envelope-to: glk-linux-kernel-3@lo.gmane.org
|
|
Received: from vger.kernel.org ([209.132.180.67])
|
|
by lo.gmane.org with esmtp (Exim 4.69)
|
|
(envelope-from <linux-kernel-owner@vger.kernel.org>)
|
|
id 1OR5eF-0008G7-BK
|
|
for glk-linux-kernel-3@lo.gmane.org; Tue, 22 Jun 2010 17:44:27 +0200
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
|
id S1754757Ab0FVPoS (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
|
Tue, 22 Jun 2010 11:44:18 -0400
|
|
Received: from victor.provo.novell.com ([137.65.250.26]:54214 "EHLO
|
|
victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
|
with ESMTP id S1752542Ab0FVPoB (ORCPT
|
|
<rfc822;groupwise-SJayaraman@novell.com:0:0>);
|
|
Tue, 22 Jun 2010 11:44:01 -0400
|
|
Received: from localhost (prv-ext-foundry1int.gns.novell.com [137.65.251.240])
|
|
by victor.provo.novell.com with ESMTP; Tue, 22 Jun 2010 09:23:50 -0600
|
|
X-Mailer: git-send-email 1.6.4.2
|
|
In-Reply-To: <yes>
|
|
Sender: linux-kernel-owner@vger.kernel.org
|
|
Precedence: bulk
|
|
List-ID: <linux-kernel.vger.kernel.org>
|
|
X-Mailing-List: linux-kernel@vger.kernel.org
|
|
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1001761>
|
|
|
|
Takes care of invalidation and release of FS-Cache marked pages and also
|
|
invalidation of the FsCache page flag when the inode is removed.
|
|
|
|
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
|
|
---
|
|
fs/cifs/cache.c | 31 +++++++++++++++++++++++++++++++
|
|
fs/cifs/file.c | 20 ++++++++++++++++++++
|
|
fs/cifs/fscache.c | 26 ++++++++++++++++++++++++++
|
|
fs/cifs/fscache.h | 16 ++++++++++++++++
|
|
4 files changed, 93 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/fs/cifs/cache.c b/fs/cifs/cache.c
|
|
index b205424..3a733c1 100644
|
|
--- a/fs/cifs/cache.c
|
|
+++ b/fs/cifs/cache.c
|
|
@@ -210,6 +210,36 @@ fscache_checkaux cifs_fscache_inode_check_aux(void *cookie_netfs_data,
|
|
return FSCACHE_CHECKAUX_OKAY;
|
|
}
|
|
|
|
+static void cifs_fscache_inode_now_uncached(void *cookie_netfs_data)
|
|
+{
|
|
+ struct cifsInodeInfo *cifsi = cookie_netfs_data;
|
|
+ struct pagevec pvec;
|
|
+ pgoff_t first;
|
|
+ int loop, nr_pages;
|
|
+
|
|
+ pagevec_init(&pvec, 0);
|
|
+ first = 0;
|
|
+
|
|
+ cFYI(1, "cifs inode 0x%p now uncached\n", cifsi);
|
|
+
|
|
+ for (;;) {
|
|
+ nr_pages = pagevec_lookup(&pvec,
|
|
+ cifsi->vfs_inode.i_mapping, first,
|
|
+ PAGEVEC_SIZE - pagevec_count(&pvec));
|
|
+ if (!nr_pages)
|
|
+ break;
|
|
+
|
|
+ for (loop = 0; loop < nr_pages; loop++)
|
|
+ ClearPageFsCache(pvec.pages[loop]);
|
|
+
|
|
+ first = pvec.pages[nr_pages - 1]->index + 1;
|
|
+
|
|
+ pvec.nr = nr_pages;
|
|
+ pagevec_release(&pvec);
|
|
+ cond_resched();
|
|
+ }
|
|
+}
|
|
+
|
|
const struct fscache_cookie_def cifs_fscache_inode_object_def = {
|
|
.name = "CIFS.uniqueid",
|
|
.type = FSCACHE_COOKIE_TYPE_DATAFILE,
|
|
@@ -217,4 +247,5 @@ const struct fscache_cookie_def cifs_fscache_inode_object_def = {
|
|
.get_attr = cifs_fscache_inode_get_attr,
|
|
.get_aux = cifs_fscache_inode_get_aux,
|
|
.check_aux = cifs_fscache_inode_check_aux,
|
|
+ .now_uncached = cifs_fscache_inode_now_uncached,
|
|
};
|
|
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
|
|
index 55ecb55..786ec04 100644
|
|
--- a/fs/cifs/file.c
|
|
+++ b/fs/cifs/file.c
|
|
@@ -2271,6 +2271,22 @@ out:
|
|
return rc;
|
|
}
|
|
|
|
+static int cifs_release_page(struct page *page, gfp_t gfp)
|
|
+{
|
|
+ if (PagePrivate(page))
|
|
+ return 0;
|
|
+
|
|
+ return cifs_fscache_release_page(page, gfp);
|
|
+}
|
|
+
|
|
+static void cifs_invalidate_page(struct page *page, unsigned long offset)
|
|
+{
|
|
+ struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host);
|
|
+
|
|
+ if (offset == 0)
|
|
+ cifs_fscache_invalidate_page(page, &cifsi->vfs_inode);
|
|
+}
|
|
+
|
|
static void
|
|
cifs_oplock_break(struct slow_work *work)
|
|
{
|
|
@@ -2344,6 +2360,8 @@ const struct address_space_operations cifs_addr_ops = {
|
|
.write_begin = cifs_write_begin,
|
|
.write_end = cifs_write_end,
|
|
.set_page_dirty = __set_page_dirty_nobuffers,
|
|
+ .releasepage = cifs_release_page,
|
|
+ .invalidatepage = cifs_invalidate_page,
|
|
/* .sync_page = cifs_sync_page, */
|
|
/* .direct_IO = */
|
|
};
|
|
@@ -2360,6 +2378,8 @@ const struct address_space_operations cifs_addr_ops_smallbuf = {
|
|
.write_begin = cifs_write_begin,
|
|
.write_end = cifs_write_end,
|
|
.set_page_dirty = __set_page_dirty_nobuffers,
|
|
+ .releasepage = cifs_release_page,
|
|
+ .invalidatepage = cifs_invalidate_page,
|
|
/* .sync_page = cifs_sync_page, */
|
|
/* .direct_IO = */
|
|
};
|
|
diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c
|
|
index ddfd355..c09d3b8 100644
|
|
--- a/fs/cifs/fscache.c
|
|
+++ b/fs/cifs/fscache.c
|
|
@@ -130,3 +130,29 @@ void cifs_fscache_reset_inode_cookie(struct inode *inode)
|
|
}
|
|
}
|
|
|
|
+int cifs_fscache_release_page(struct page *page, gfp_t gfp)
|
|
+{
|
|
+ if (PageFsCache(page)) {
|
|
+ struct inode *inode = page->mapping->host;
|
|
+ struct cifsInodeInfo *cifsi = CIFS_I(inode);
|
|
+
|
|
+ cFYI(1, "CIFS: fscache release page (0x%p/0x%p)\n",
|
|
+ cifsi->fscache, page);
|
|
+ if (!fscache_maybe_release_page(cifsi->fscache, page, gfp))
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode)
|
|
+{
|
|
+ struct cifsInodeInfo *cifsi = CIFS_I(inode);
|
|
+ struct fscache_cookie *cookie = cifsi->fscache;
|
|
+
|
|
+ cFYI(1, "CIFS: fscache invalidatepage (0x%p/0x%p/0x%p)\n",
|
|
+ cookie, page, cifsi);
|
|
+ fscache_wait_on_page_write(cookie, page);
|
|
+ fscache_uncache_page(cookie, page);
|
|
+}
|
|
+
|
|
diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h
|
|
index 836bb02..127cb0a 100644
|
|
--- a/fs/cifs/fscache.h
|
|
+++ b/fs/cifs/fscache.h
|
|
@@ -47,6 +47,16 @@ extern void cifs_fscache_release_inode_cookie(struct inode *);
|
|
extern void cifs_fscache_set_inode_cookie(struct inode *, struct file *);
|
|
extern void cifs_fscache_reset_inode_cookie(struct inode *);
|
|
|
|
+extern void __cifs_fscache_invalidate_page(struct page *, struct inode *);
|
|
+extern int cifs_fscache_release_page(struct page *page, gfp_t gfp);
|
|
+
|
|
+static inline void cifs_fscache_invalidate_page(struct page *page,
|
|
+ struct inode *inode)
|
|
+{
|
|
+ if (PageFsCache(page))
|
|
+ __cifs_fscache_invalidate_page(page, inode);
|
|
+}
|
|
+
|
|
#else /* CONFIG_CIFS_FSCACHE */
|
|
static inline int cifs_fscache_register(void) { return 0; }
|
|
static inline void cifs_fscache_unregister(void) {}
|
|
@@ -63,7 +73,13 @@ static inline void cifs_fscache_release_inode_cookie(struct inode *inode) {}
|
|
static inline void cifs_fscache_set_inode_cookie(struct inode *inode,
|
|
struct file *filp) {}
|
|
static inline void cifs_fscache_reset_inode_cookie(struct inode *inode) {}
|
|
+static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp)
|
|
+{
|
|
+ return 1; /* May release page */
|
|
+}
|
|
|
|
+static inline int cifs_fscache_invalidate_page(struct page *page,
|
|
+ struct inode *) {}
|
|
|
|
#endif /* CONFIG_CIFS_FSCACHE */
|
|
|
|
--
|
|
1.6.4.2
|
|
|
|
|
|
|