From: Peng Tao <bergwolf@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
Peng Tao <tao.peng@emc.com>,
Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH-v2 14/17] staging/lustre: fix for invalidatepage() API change
Date: Mon, 15 Jul 2013 21:08:12 +0800 [thread overview]
Message-ID: <1373893695-4094-15-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1373893695-4094-1-git-send-email-bergwolf@gmail.com>
From: Stephen Rothwell <sfr@canb.auug.org.au>
somehow this got dropped during merge window...
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
---
.../lustre/include/linux/lustre_patchless_compat.h | 2 +-
drivers/staging/lustre/lustre/llite/rw26.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h
index a8e9c0c..a260e99 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_patchless_compat.h
@@ -53,7 +53,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
return;
if (PagePrivate(page))
- page->mapping->a_ops->invalidatepage(page, 0);
+ page->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE);
cancel_dirty_page(page, PAGE_SIZE);
ClearPageMappedToDisk(page);
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 27e4e64..f1a1c5f 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -72,7 +72,8 @@
* aligned truncate). Lustre leaves partially truncated page in the cache,
* relying on struct inode::i_size to limit further accesses.
*/
-static void ll_invalidatepage(struct page *vmpage, unsigned long offset)
+static void ll_invalidatepage(struct page *vmpage, unsigned int offset,
+ unsigned int length)
{
struct inode *inode;
struct lu_env *env;
@@ -89,7 +90,7 @@ static void ll_invalidatepage(struct page *vmpage, unsigned long offset)
* below because they are run with page locked and all our io is
* happening with locked page too
*/
- if (offset == 0) {
+ if (offset == 0 && length == PAGE_CACHE_SIZE) {
env = cl_env_get(&refcheck);
if (!IS_ERR(env)) {
inode = vmpage->mapping->host;
--
1.7.9.5
next prev parent reply other threads:[~2013-07-15 13:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-15 13:07 [PATCH-v2 00/17] staging/lustre: fix various build issues Peng Tao
2013-07-15 13:07 ` [PATCH-v2 01/17] staging/lustre: replace num_physpages with totalram_pages Peng Tao
2013-07-15 13:08 ` [PATCH-v2 02/17] staging/lustre: fix Lustre code link order Peng Tao
2013-07-15 13:08 ` [PATCH-v2 03/17] staging/lustre: don't assert module owner Peng Tao
2013-07-15 13:08 ` [PATCH-v2 04/17] staging/lustre: don't assert ln_refcount in LNetGetId Peng Tao
2013-07-15 13:08 ` [PATCH-v2 05/17] stating/lustre: only build if configured as module Peng Tao
2013-07-15 13:08 ` [PATCH-v2 06/17] staging/lustre: remove HIPQUAD Peng Tao
2013-07-15 13:38 ` Joe Perches
2013-07-15 14:08 ` Peng Tao
2013-07-15 13:08 ` [PATCH-v2 07/17] staging/lustre: fix build error when !CONFIG_SMP Peng Tao
2013-07-15 13:08 ` [PATCH-v2 08/17] staging/lustre: fix build on s390 Peng Tao
2013-07-15 13:08 ` [PATCH-v2 09/17] staging/lustre/llite: add missing include file for prefetchw Peng Tao
2013-07-15 13:08 ` [PATCH-v2 10/17] staging/lustre/llite: fix build erorr if CONFIG_FS_POSIX_ACL is off Peng Tao
2013-07-15 13:08 ` [PATCH-v2 11/17] staging/lustre: fix build when CONFIG_UIDGID_STRICT_TYPE_CHECKS is on Peng Tao
2013-07-15 13:08 ` [PATCH-v2 12/17] staging/lustre: fix build error on non-x86 platforms Peng Tao
2013-07-15 13:08 ` [PATCH-v2 13/17] staging/lustre: fix build warnning on 32bit system Peng Tao
2013-07-15 13:08 ` Peng Tao [this message]
2013-07-15 13:08 ` [PATCH-v2 15/17] staging/lustre/llite: fix for d_compare API change Peng Tao
2013-07-15 13:08 ` [PATCH-v2 16/17] staging/lustre/llite: readdir convert to iterate Peng Tao
2013-07-15 13:08 ` [PATCH-v2 17/17] staging/lustre: drop CONFIG_BROKEN Peng Tao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1373893695-4094-15-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tao.peng@emc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox