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

Commit e81f1c5c authored by Joseph Qi's avatar Joseph Qi Committed by Linus Torvalds
Browse files

ocfs2: remove obscure BUG_ON in dlmglue 

These BUG_ON(!inode) are obscure because we have already used inode to
get osb.  And actually we can guarantee here inode is valid in the
context.  So we can safely remove them.

Link: http://lkml.kernel.org/r/5776336A.6030104@huawei.com


Signed-off-by: default avatarJoseph Qi <joseph.qi@huawei.com>
Reviewed-by: default avatarEric Ren <zren@suse.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 698d44b4

fs/ocfs2/dlmglue.c

+0 −9
Original line number Diff line number Diff line
@@ -1635,7 +1635,6 @@ int ocfs2_create_new_inode_locks(struct inode *inode) 
	int ret;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	BUG_ON(!inode);

	BUG_ON(!ocfs2_inode_is_new(inode));



	mlog(0, "Inode %llu\n", (unsigned long long)OCFS2_I(inode)->ip_blkno);
@@ -1678,8 +1677,6 @@ int ocfs2_rw_lock(struct inode *inode, int write) 
	struct ocfs2_lock_res *lockres;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	BUG_ON(!inode);



	mlog(0, "inode %llu take %s RW lock\n",

	     (unsigned long long)OCFS2_I(inode)->ip_blkno,

	     write ? "EXMODE" : "PRMODE");
@@ -1722,8 +1719,6 @@ int ocfs2_open_lock(struct inode *inode) 
	struct ocfs2_lock_res *lockres;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	BUG_ON(!inode);



	mlog(0, "inode %llu take PRMODE open lock\n",

	     (unsigned long long)OCFS2_I(inode)->ip_blkno);
@@ -1747,8 +1742,6 @@ int ocfs2_try_open_lock(struct inode *inode, int write) 
	struct ocfs2_lock_res *lockres;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	BUG_ON(!inode);



	mlog(0, "inode %llu try to take %s open lock\n",

	     (unsigned long long)OCFS2_I(inode)->ip_blkno,

	     write ? "EXMODE" : "PRMODE");
@@ -2326,8 +2319,6 @@ int ocfs2_inode_lock_full_nested(struct inode *inode, 
	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	struct buffer_head *local_bh = NULL;



	BUG_ON(!inode);



	mlog(0, "inode %llu, take %s META lock\n",

	     (unsigned long long)OCFS2_I(inode)->ip_blkno,

	     ex ? "EXMODE" : "PRMODE");