From: Martin Brandenburg <martin@omnibond.com>
To: hubcap@omnibond.com, linux-fsdevel@vger.kernel.org
Cc: Martin Brandenburg <martin@omnibond.com>
Subject: [PATCH 05/13] orangefs: BUG_ON if i_mode invalid
Date: Mon, 22 May 2017 05:58:53 -0400 [thread overview]
Message-ID: <1495447141-12216-6-git-send-email-martin@omnibond.com> (raw)
In-Reply-To: <1495447141-12216-1-git-send-email-martin@omnibond.com>
This can't happen since it would have been caught (and a graceful
error returned) earlier.
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
---
fs/orangefs/inode.c | 14 ++++----------
fs/orangefs/orangefs-utils.c | 4 ++++
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index a9681b0..9912104 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -175,22 +175,16 @@ static int orangefs_init_iops(struct inode *inode)
inode->i_fop = &orangefs_file_operations;
inode->i_data.a_ops = &orangefs_address_operations;
inode->i_blkbits = PAGE_SHIFT;
- break;
+ return 0;
case S_IFLNK:
inode->i_op = &orangefs_symlink_inode_operations;
- break;
+ return 0;
case S_IFDIR:
inode->i_op = &orangefs_dir_inode_operations;
inode->i_fop = &orangefs_dir_operations;
- break;
- default:
- gossip_debug(GOSSIP_INODE_DEBUG,
- "%s: unsupported mode\n",
- __func__);
- return -EINVAL;
+ return 0;
}
-
- return 0;
+ BUG_ON(1);
}
/*
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index aab6f18..1fb90bd 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -294,6 +294,10 @@ int orangefs_inode_getattr(struct inode *inode, int new, int bypass,
type = orangefs_inode_type(new_op->
downcall.resp.getattr.attributes.objtype);
+ if (type == -1) {
+ ret = -EIO;
+ goto out;
+ }
ret = orangefs_inode_is_stale(inode, new,
&new_op->downcall.resp.getattr.attributes,
new_op->downcall.resp.getattr.link_target);
--
2.1.4
next prev parent reply other threads:[~2017-05-22 21:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-22 9:58 [PATCH 00/13] [RFC] orangefs page cache Martin Brandenburg
2017-05-22 9:58 ` [PATCH 01/13] orangefs: move orangefs_address_operations to file.c Martin Brandenburg
2017-05-22 9:58 ` [PATCH 02/13] orangefs: remove orangefs_readpages Martin Brandenburg
2017-05-22 9:58 ` [PATCH 03/13] orangefs: make orangefs_inode_read static Martin Brandenburg
2017-05-22 9:58 ` [PATCH 04/13] orangefs: only set a_ops for regular files Martin Brandenburg
2017-05-22 9:58 ` Martin Brandenburg [this message]
2017-05-22 9:58 ` [PATCH 06/13] orangefs: remove mapping_nrpages macro Martin Brandenburg
2017-05-22 9:58 ` [PATCH 07/13] orangefs: set up and use backing_dev_info Martin Brandenburg
2017-05-22 9:58 ` [PATCH 08/13] orangefs: initialize new inode size to zero Martin Brandenburg
2017-05-22 9:58 ` [PATCH 09/13] orangefs: inodes linger in cache Martin Brandenburg
2017-05-22 9:58 ` [PATCH 10/13] orangefs: implement direct_IO for the read case Martin Brandenburg
2017-05-22 9:58 ` [PATCH 11/13] orangefs: lock inode during fsync Martin Brandenburg
2017-05-25 15:58 ` Jeff Layton
2017-05-26 16:21 ` martin
2017-05-26 16:58 ` Jeff Layton
2017-05-22 9:59 ` [PATCH 12/13] orangefs: call generic_file_read_iter Martin Brandenburg
2017-05-22 9:59 ` [PATCH 13/13] orangefs: implement write through the page cache Martin Brandenburg
2017-05-25 16:09 ` Jeff Layton
2017-05-26 18:09 ` martin
2017-05-26 18:48 ` Jeff Layton
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=1495447141-12216-6-git-send-email-martin@omnibond.com \
--to=martin@omnibond.com \
--cc=hubcap@omnibond.com \
--cc=linux-fsdevel@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;
as well as URLs for NNTP newsgroup(s).