mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
wrappers for ->i_mutex access
parallel to mutex_{lock,unlock,trylock,is_locked,lock_nested},
inode_foo(inode) being mutex_foo(&inode->i_mutex).
Please, use those for access to ->i_mutex; over the coming cycle
->i_mutex will become rwsem, with ->lookup() done with it held
only shared.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -255,7 +255,7 @@ static int mknod_ptmx(struct super_block *sb)
|
||||
if (!uid_valid(root_uid) || !gid_valid(root_gid))
|
||||
return -EINVAL;
|
||||
|
||||
mutex_lock(&d_inode(root)->i_mutex);
|
||||
inode_lock(d_inode(root));
|
||||
|
||||
/* If we have already created ptmx node, return */
|
||||
if (fsi->ptmx_dentry) {
|
||||
@@ -292,7 +292,7 @@ static int mknod_ptmx(struct super_block *sb)
|
||||
fsi->ptmx_dentry = dentry;
|
||||
rc = 0;
|
||||
out:
|
||||
mutex_unlock(&d_inode(root)->i_mutex);
|
||||
inode_unlock(d_inode(root));
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -615,7 +615,7 @@ struct inode *devpts_pty_new(struct inode *ptmx_inode, dev_t device, int index,
|
||||
|
||||
sprintf(s, "%d", index);
|
||||
|
||||
mutex_lock(&d_inode(root)->i_mutex);
|
||||
inode_lock(d_inode(root));
|
||||
|
||||
dentry = d_alloc_name(root, s);
|
||||
if (dentry) {
|
||||
@@ -626,7 +626,7 @@ struct inode *devpts_pty_new(struct inode *ptmx_inode, dev_t device, int index,
|
||||
inode = ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
mutex_unlock(&d_inode(root)->i_mutex);
|
||||
inode_unlock(d_inode(root));
|
||||
|
||||
return inode;
|
||||
}
|
||||
@@ -671,7 +671,7 @@ void devpts_pty_kill(struct inode *inode)
|
||||
|
||||
BUG_ON(inode->i_rdev == MKDEV(TTYAUX_MAJOR, PTMX_MINOR));
|
||||
|
||||
mutex_lock(&d_inode(root)->i_mutex);
|
||||
inode_lock(d_inode(root));
|
||||
|
||||
dentry = d_find_alias(inode);
|
||||
|
||||
@@ -680,7 +680,7 @@ void devpts_pty_kill(struct inode *inode)
|
||||
dput(dentry); /* d_alloc_name() in devpts_pty_new() */
|
||||
dput(dentry); /* d_find_alias above */
|
||||
|
||||
mutex_unlock(&d_inode(root)->i_mutex);
|
||||
inode_unlock(d_inode(root));
|
||||
}
|
||||
|
||||
static int __init init_devpts_fs(void)
|
||||
|
||||
Reference in New Issue
Block a user