From: Martin Brandenburg <martin@omnibond.com>
To: hubcap@omnibond.com, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, devel@lists.orangefs.org
Cc: Martin Brandenburg <martin@omnibond.com>
Subject: [PATCH 4/7] orangefs: make orangefs_make_bad_inode static
Date: Fri, 26 Jan 2018 14:07:14 -0500 [thread overview]
Message-ID: <20180126190717.11075-5-martin@omnibond.com> (raw)
In-Reply-To: <20180126190717.11075-1-martin@omnibond.com>
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
---
fs/orangefs/orangefs-kernel.h | 2 --
fs/orangefs/orangefs-utils.c | 38 +++++++++++++++++++-------------------
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 25bacc334d91..eebbaece85ef 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -467,8 +467,6 @@ int orangefs_inode_check_changed(struct inode *inode);
int orangefs_inode_setattr(struct inode *inode, struct iattr *iattr);
-void orangefs_make_bad_inode(struct inode *inode);
-
int orangefs_unmount_sb(struct super_block *sb);
bool orangefs_cancel_op_in_progress(struct orangefs_kernel_op_s *op);
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index 97fe93129f38..3098c2ee7b5f 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -230,6 +230,25 @@ static int orangefs_inode_type(enum orangefs_ds_type objtype)
return -1;
}
+static void orangefs_make_bad_inode(struct inode *inode)
+{
+ if (is_root_handle(inode)) {
+ /*
+ * if this occurs, the pvfs2-client-core was killed but we
+ * can't afford to lose the inode operations and such
+ * associated with the root handle in any case.
+ */
+ gossip_debug(GOSSIP_UTILS_DEBUG,
+ "*** NOT making bad root inode %pU\n",
+ get_khandle_from_ino(inode));
+ } else {
+ gossip_debug(GOSSIP_UTILS_DEBUG,
+ "*** making bad inode %pU\n",
+ get_khandle_from_ino(inode));
+ make_bad_inode(inode);
+ }
+}
+
static int orangefs_inode_is_stale(struct inode *inode, int new,
struct ORANGEFS_sys_attr_s *attrs, char *link_target)
{
@@ -444,25 +463,6 @@ int orangefs_inode_setattr(struct inode *inode, struct iattr *iattr)
return ret;
}
-void orangefs_make_bad_inode(struct inode *inode)
-{
- if (is_root_handle(inode)) {
- /*
- * if this occurs, the pvfs2-client-core was killed but we
- * can't afford to lose the inode operations and such
- * associated with the root handle in any case.
- */
- gossip_debug(GOSSIP_UTILS_DEBUG,
- "*** NOT making bad root inode %pU\n",
- get_khandle_from_ino(inode));
- } else {
- gossip_debug(GOSSIP_UTILS_DEBUG,
- "*** making bad inode %pU\n",
- get_khandle_from_ino(inode));
- make_bad_inode(inode);
- }
-}
-
/*
* The following is a very dirty hack that is now a permanent part of the
* ORANGEFS protocol. See protocol.h for more error definitions.
--
2.14.2
next prev parent reply other threads:[~2018-01-26 19:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-26 19:07 [PATCH 0/7] orangefs uapi Martin Brandenburg
2018-01-26 19:07 ` [PATCH 1/7] orangefs: make orangefs_client_debug_init static Martin Brandenburg
2018-01-26 19:07 ` [PATCH 2/7] orangefs: remove gossip_ldebug and gossip_lerr Martin Brandenburg
2018-01-26 19:07 ` [PATCH 3/7] orangefs: remove ORANGEFS_KERNEL_DEBUG Martin Brandenburg
2018-01-26 19:07 ` Martin Brandenburg [this message]
2018-01-26 19:07 ` [PATCH 5/7] ornagefs: make several *_operations structs static Martin Brandenburg
2018-01-26 19:07 ` [PATCH 6/7] orangefs: remove unused code Martin Brandenburg
2018-01-26 19:07 ` [PATCH 7/7] orangefs: create uapi interface Martin Brandenburg
2018-01-26 19:15 ` [PATCH 0/7] orangefs uapi martin
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=20180126190717.11075-5-martin@omnibond.com \
--to=martin@omnibond.com \
--cc=devel@lists.orangefs.org \
--cc=hubcap@omnibond.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®