From: Oleg Drokin <green@linuxhacker.ru>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH v2 16/29] staging/lustre: Inline Lustre intent disposition functions
Date: Mon, 20 Jun 2016 16:55:39 -0400 [thread overview]
Message-ID: <1466456152-2199975-17-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1466456152-2199975-1-git-send-email-green@linuxhacker.ru>
They are just one-liners, so no point in having them exported
and called through a different module.
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
drivers/staging/lustre/lustre/include/lustre_intent.h | 15 +++++++++++++++
drivers/staging/lustre/lustre/include/lustre_mdc.h | 3 ---
drivers/staging/lustre/lustre/mdc/mdc_locks.c | 18 ------------------
3 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_intent.h b/drivers/staging/lustre/lustre/include/lustre_intent.h
index 41c03d7..3aed810 100644
--- a/drivers/staging/lustre/lustre/include/lustre_intent.h
+++ b/drivers/staging/lustre/lustre/include/lustre_intent.h
@@ -50,4 +50,19 @@ struct lookup_intent {
unsigned int it_lock_set:1;
};
+static inline int it_disposition(struct lookup_intent *it, int flag)
+{
+ return it->it_disposition & flag;
+}
+
+static inline void it_set_disposition(struct lookup_intent *it, int flag)
+{
+ it->it_disposition |= flag;
+}
+
+static inline void it_clear_disposition(struct lookup_intent *it, int flag)
+{
+ it->it_disposition &= ~flag;
+}
+
#endif
diff --git a/drivers/staging/lustre/lustre/include/lustre_mdc.h b/drivers/staging/lustre/lustre/include/lustre_mdc.h
index 0ef4226..fa62b95 100644
--- a/drivers/staging/lustre/lustre/include/lustre_mdc.h
+++ b/drivers/staging/lustre/lustre/include/lustre_mdc.h
@@ -185,9 +185,6 @@ struct mdc_cache_waiter {
};
/* mdc/mdc_locks.c */
-int it_disposition(struct lookup_intent *it, int flag);
-void it_clear_disposition(struct lookup_intent *it, int flag);
-void it_set_disposition(struct lookup_intent *it, int flag);
int it_open_error(int phase, struct lookup_intent *it);
static inline bool cl_is_lov_delay_create(unsigned int flags)
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index 5da2a1e..c43b3a2 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -50,24 +50,6 @@ struct mdc_getattr_args {
struct ldlm_enqueue_info *ga_einfo;
};
-int it_disposition(struct lookup_intent *it, int flag)
-{
- return it->it_disposition & flag;
-}
-EXPORT_SYMBOL(it_disposition);
-
-void it_set_disposition(struct lookup_intent *it, int flag)
-{
- it->it_disposition |= flag;
-}
-EXPORT_SYMBOL(it_set_disposition);
-
-void it_clear_disposition(struct lookup_intent *it, int flag)
-{
- it->it_disposition &= ~flag;
-}
-EXPORT_SYMBOL(it_clear_disposition);
-
int it_open_error(int phase, struct lookup_intent *it)
{
if (it_disposition(it, DISP_OPEN_LEASE)) {
--
2.7.4
next prev parent reply other threads:[~2016-06-20 20:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 20:55 [PATCH v2 00/29] Lustre fixes Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 01/29] staging/lustre/llite: allocate and free client cache asynchronously Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 02/29] staging/lustre/llite: correct request handling after ll_lookup_it() Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 03/29] staging/lustre/llite: Get rid of ll_lock_dcache/ll_unlock_dcache Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 04/29] staging/lustre/llite: lock i_lock before __d_drop() Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 05/29] staging/lustre/osc: osc_lock_weight endless loop fix Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 06/29] staging/lustre/osc: Fix reverted condition in osc_lock_weight Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 07/29] staging/lustre/ptlrpc: reorganize ptlrpc_request Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 08/29] staging/lustre/ptlrpc: missing wakeup for ptlrpc_check_set Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 09/29] staging/lustre/ptlrpc: Early Reply vs Reply MDunlink Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 10/29] staging/lustre/ptlrpc: Remove __ptlrpc_request_bufs_pack Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 11/29] staging/lustre/ptlrpc: lost bulk leads to a hang Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 12/29] staging/lustre/llite: take trunc_sem only at vvp layer Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 13/29] staging/lustre: LDLM_DEBUG() shouldn't be passed \n Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 14/29] staging/lustre: Add newline to LU_OBJECT_DEBUG() message Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 15/29] staging/lustre/llite: flatten struct lookup_intent Oleg Drokin
2016-06-20 20:55 ` Oleg Drokin [this message]
2016-06-20 20:55 ` [PATCH v2 17/29] staging/lustre/llite: change it_data to it_request Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 18/29] staging/lustre/ldlm: const qualify struct lustre_handle * params Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 21/29] staging/lustre/llite: don't panic when fid is insane Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 22/29] staging/lustre/llite: Restore proper opencache operations Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 23/29] staging/lustre/llite: ll_revalidate_dentry update Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 24/29] staging/lustre/llite: IOC_MDC_GETFILEINFO returns the wrong ino Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 25/29] staging/lustre/osc: fix signed one bit field Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 26/29] staging/lustre: Add documentation for unstable_stats in sysfs Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 27/29] staging/lustre/osc: glimpse lock should match only with granted locks Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 28/29] staging/lustre/libcfs: Do not call kthread_run in wrong state Oleg Drokin
2016-06-20 20:55 ` [PATCH v2 29/29] staging: lustre: quiet lockdep recursive lock warning Oleg Drokin
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=1466456152-2199975-17-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
/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
Powered by JetHome