Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d0cac7e authored by Martin Brandenburg's avatar Martin Brandenburg Committed by Mike Marshall
Browse files

orangefs: make orangefs_make_bad_inode static 



Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
Signed-off-by: default avatarMike Marshall <hubcap@omnibond.com>
parent 538e3048

fs/orangefs/orangefs-kernel.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

fs/orangefs/orangefs-utils.c

+19 −19
Original line number Diff line number Diff line
@@ -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.