d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework some tmpfs lock assertions.

Browse Source 
Remove TMPFS_ASSERT_ELOCKED().  Its claims are already stated by other
asserts nearby and by VFS guarantees.
Change TMPFS_ASSERT_LOCKED() and one inlined place to use
ASSERT_VOP_(E)LOCKED() instead of hand-rolled imprecise asserts.

Tested by:	pho (as part of the larger patch)
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2017-01-19 14:49:55 +00:00
parent bba7ed2054
commit e7e6c82067
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/fs/tmpfs/tmpfs.h
View File

@ -309,19 +309,10 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node);
#define TMPFS_ASSERT_LOCKED(node) do { \
MPASS(node != NULL); \
MPASS(node->tn_vnode != NULL); \
if (!VOP_ISLOCKED(node->tn_vnode) && \
!mtx_owned(TMPFS_NODE_MTX(node))) \
panic("tmpfs: node is not locked: %p", node); \
} while (0)
#define TMPFS_ASSERT_ELOCKED(node) do { \
MPASS((node) != NULL); \
MPASS((node)->tn_vnode != NULL); \
mtx_assert(TMPFS_NODE_MTX(node), MA_OWNED); \
ASSERT_VOP_LOCKED((node)->tn_vnode, "tmpfs"); \
ASSERT_VOP_LOCKED(node->tn_vnode, "tmpfs assert"); \
} while (0)
#else
#define TMPFS_ASSERT_LOCKED(node) (void)0
#define TMPFS_ASSERT_ELOCKED(node) (void)0
#endif
#define TMPFS_VNODE_ALLOCATING 1

2
sys/fs/tmpfs/tmpfs_subr.c
View File

@ -669,7 +669,7 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap,
struct tmpfs_node *node;
struct tmpfs_node *parent;
MPASS(VOP_ISLOCKED(dvp));
ASSERT_VOP_ELOCKED(dvp, "tmpfs_alloc_file");
MPASS(cnp->cn_flags & HASBUF);
tmp = VFS_TO_TMPFS(dvp->v_mount);

3
sys/fs/tmpfs/tmpfs_vnops.c
View File

@ -1111,7 +1111,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
/* No vnode should be allocated for this entry from this point */
TMPFS_NODE_LOCK(node);
TMPFS_ASSERT_ELOCKED(node);
node->tn_links--;
node->tn_dir.tn_parent = NULL;
node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED |
@ -1120,7 +1119,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
TMPFS_NODE_UNLOCK(node);
TMPFS_NODE_LOCK(dnode);
TMPFS_ASSERT_ELOCKED(dnode);
dnode->tn_links--;
dnode->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED |
TMPFS_NODE_MODIFIED;
@ -1274,7 +1272,6 @@ tmpfs_reclaim(struct vop_reclaim_args *v)
cache_purge(vp);
TMPFS_NODE_LOCK(node);
TMPFS_ASSERT_ELOCKED(node);
tmpfs_free_vp(vp);
/* If the node referenced by this vnode was deleted by the user,