From patchwork Tue Jun 22 15:24:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suresh Jayaraman X-Patchwork-Id: 107432 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5MFj1dc028887 for ; Tue, 22 Jun 2010 15:45:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754953Ab0FVPon (ORCPT ); Tue, 22 Jun 2010 11:44:43 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:58250 "EHLO victor.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751265Ab0FVPok (ORCPT ); Tue, 22 Jun 2010 11:44:40 -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:24:02 -0600 From: Suresh Jayaraman To: Steve French Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells Subject: [RFC][PATCH 08/10] cifs: store pages into local cache Date: Tue, 22 Jun 2010 20:54:00 +0530 Message-Id: <1277220240-3674-1-git-send-email-sjayaraman@suse.de> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: References: Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 22 Jun 2010 15:45:02 +0000 (UTC) diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 786ec04..39c1ce0 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -2060,6 +2060,8 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, we will hit it on next read */ /* break; */ + /* send this page to FS-Cache */ + cifs_readpage_to_fscache(mapping->host, page); } } else { cFYI(1, "No bytes read (%d) at offset %lld . " @@ -2117,6 +2119,10 @@ static int cifs_readpage_worker(struct file *file, struct page *page, flush_dcache_page(page); SetPageUptodate(page); + + /* send this page to the cache */ + cifs_readpage_to_fscache(file->f_path.dentry->d_inode, page); + rc = 0; io_error: diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c index c09d3b8..13e47d5 100644 --- a/fs/cifs/fscache.c +++ b/fs/cifs/fscache.c @@ -145,6 +145,19 @@ int cifs_fscache_release_page(struct page *page, gfp_t gfp) return 1; } +void __cifs_readpage_to_fscache(struct inode *inode, struct page *page) +{ + int ret; + + cFYI(1, "CIFS: readpage_to_fscache(fsc: %p, p: %p, i: %p\n", + CIFS_I(inode)->fscache, page, inode); + ret = fscache_write_page(CIFS_I(inode)->fscache, page, GFP_KERNEL); + cFYI(1, "CIFS: fscache_write_page returned %d\n", ret); + + if (ret != 0) + fscache_uncache_page(CIFS_I(inode)->fscache, page); +} + void __cifs_fscache_invalidate_page(struct page *page, struct inode *inode) { struct cifsInodeInfo *cifsi = CIFS_I(inode); diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h index 127cb0a..e34d8ab 100644 --- a/fs/cifs/fscache.h +++ b/fs/cifs/fscache.h @@ -50,6 +50,8 @@ 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); +extern void __cifs_readpage_to_fscache(struct inode *, struct page *); + static inline void cifs_fscache_invalidate_page(struct page *page, struct inode *inode) { @@ -57,6 +59,13 @@ static inline void cifs_fscache_invalidate_page(struct page *page, __cifs_fscache_invalidate_page(page, inode); } +static inline void cifs_readpage_to_fscache(struct inode *inode, + struct page *page) +{ + if (PageFsCache(page)) + __cifs_readpage_to_fscache(inode, page); +} + #else /* CONFIG_CIFS_FSCACHE */ static inline int cifs_fscache_register(void) { return 0; } static inline void cifs_fscache_unregister(void) {} @@ -80,6 +89,8 @@ static inline void cifs_fscache_release_page(struct page *page, gfp_t gfp) static inline int cifs_fscache_invalidate_page(struct page *page, struct inode *) {} +static inline void cifs_readpage_to_fscache(struct inode *inode, + struct page *page) {} #endif /* CONFIG_CIFS_FSCACHE */