From: Martin Brandenburg <martin@omnibond.com>
Date: Wed, 16 Mar 2016 18:35:21 +0000 (-0400)
Subject: orangefs: remove paranoia in orangefs_set_inode
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4c680a027f52e179175fe451c69a55aba748efd;p=linux-beck.git

orangefs: remove paranoia in orangefs_set_inode

Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
---

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 4a350ec2dbb3..a45625240b17 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -365,16 +365,8 @@ static inline ino_t orangefs_handle_hash(struct orangefs_object_kref *ref)
 static int orangefs_set_inode(struct inode *inode, void *data)
 {
 	struct orangefs_object_kref *ref = (struct orangefs_object_kref *) data;
-	struct orangefs_inode_s *orangefs_inode = NULL;
-
-	/* Make sure that we have sane parameters */
-	if (!data || !inode)
-		return 0;
-	orangefs_inode = ORANGEFS_I(inode);
-	if (!orangefs_inode)
-		return 0;
-	orangefs_inode->refn.fs_id = ref->fs_id;
-	orangefs_inode->refn.khandle = ref->khandle;
+	ORANGEFS_I(inode)->refn.fs_id = ref->fs_id;
+	ORANGEFS_I(inode)->refn.khandle = ref->khandle;
 	return 0;
 }