mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -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 <[email protected]>
This commit is contained in:
parent
57b8f112cf
commit
5955102c99
177 changed files with 908 additions and 883 deletions
|
|
@ -369,7 +369,7 @@ ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
|
|||
if (!res) {
|
||||
struct inode *inode = d_inode(dentry);
|
||||
|
||||
mutex_lock(&inode->i_mutex);
|
||||
inode_lock(inode);
|
||||
if (finfo.i.dirEntNum == NCP_FINFO(inode)->dirEntNum) {
|
||||
ncp_new_dentry(dentry);
|
||||
val=1;
|
||||
|
|
@ -377,7 +377,7 @@ ncp_lookup_validate(struct dentry *dentry, unsigned int flags)
|
|||
ncp_dbg(2, "found, but dirEntNum changed\n");
|
||||
|
||||
ncp_update_inode2(inode, &finfo);
|
||||
mutex_unlock(&inode->i_mutex);
|
||||
inode_unlock(inode);
|
||||
}
|
||||
|
||||
finished:
|
||||
|
|
@ -639,9 +639,9 @@ ncp_fill_cache(struct file *file, struct dir_context *ctx,
|
|||
} else {
|
||||
struct inode *inode = d_inode(newdent);
|
||||
|
||||
mutex_lock_nested(&inode->i_mutex, I_MUTEX_CHILD);
|
||||
inode_lock_nested(inode, I_MUTEX_CHILD);
|
||||
ncp_update_inode2(inode, entry);
|
||||
mutex_unlock(&inode->i_mutex);
|
||||
inode_unlock(inode);
|
||||
}
|
||||
|
||||
if (ctl.idx >= NCP_DIRCACHE_SIZE) {
|
||||
|
|
|
|||
|
|
@ -224,10 +224,10 @@ ncp_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
|
|||
iocb->ki_pos = pos;
|
||||
|
||||
if (pos > i_size_read(inode)) {
|
||||
mutex_lock(&inode->i_mutex);
|
||||
inode_lock(inode);
|
||||
if (pos > i_size_read(inode))
|
||||
i_size_write(inode, pos);
|
||||
mutex_unlock(&inode->i_mutex);
|
||||
inode_unlock(inode);
|
||||
}
|
||||
ncp_dbg(1, "exit %pD2\n", file);
|
||||
outrel:
|
||||
|
|
|
|||
Loading…
Reference in a new issue