public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Peng Tao <bergwolf@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, Peng Tao <tao.peng@emc.com>,
	Andreas Dilger <andreas.dilger@intel.com>
Subject: [PATCH-v2 15/17] staging/lustre/llite: fix for d_compare API change
Date: Mon, 15 Jul 2013 21:08:13 +0800	[thread overview]
Message-ID: <1373893695-4094-16-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1373893695-4094-1-git-send-email-bergwolf@gmail.com>

From: Peng Tao <tao.peng@emc.com>

Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
---
 drivers/staging/lustre/lustre/llite/dcache.c       |    3 +--
 .../staging/lustre/lustre/llite/llite_internal.h   |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/dcache.c b/drivers/staging/lustre/lustre/llite/dcache.c
index 40b0f3b..a160a84 100644
--- a/drivers/staging/lustre/lustre/llite/dcache.c
+++ b/drivers/staging/lustre/lustre/llite/dcache.c
@@ -84,8 +84,7 @@ static void ll_release(struct dentry *de)
  * an AST before calling d_revalidate_it().  The dentry still exists (marked
  * INVALID) so d_lookup() matches it, but we have no lock on it (so
  * lock_match() fails) and we spin around real_lookup(). */
-int ll_dcompare(const struct dentry *parent, const struct inode *pinode,
-		const struct dentry *dentry, const struct inode *inode,
+int ll_dcompare(const struct dentry *parent, const struct dentry *dentry,
 		unsigned int len, const char *str, const struct qstr *name)
 {
 	ENTRY;
diff --git a/drivers/staging/lustre/lustre/llite/llite_internal.h b/drivers/staging/lustre/lustre/llite/llite_internal.h
index 1069b8d..cbcd118 100644
--- a/drivers/staging/lustre/lustre/llite/llite_internal.h
+++ b/drivers/staging/lustre/lustre/llite/llite_internal.h
@@ -784,8 +784,7 @@ void ll_intent_release(struct lookup_intent *);
 void ll_invalidate_aliases(struct inode *);
 void ll_frob_intent(struct lookup_intent **itp, struct lookup_intent *deft);
 void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
-int ll_dcompare(const struct dentry *parent, const struct inode *pinode,
-		const struct dentry *dentry, const struct inode *inode,
+int ll_dcompare(const struct dentry *parent, const struct dentry *dentry,
 		unsigned int len, const char *str, const struct qstr *d_name);
 int ll_revalidate_it_finish(struct ptlrpc_request *request,
 			    struct lookup_intent *it, struct dentry *de);
-- 
1.7.9.5


  parent reply	other threads:[~2013-07-15 13:11 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 ` [PATCH-v2 14/17] staging/lustre: fix for invalidatepage() API change Peng Tao
2013-07-15 13:08 ` Peng Tao [this message]
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-16-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=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