aboutsummaryrefslogtreecommitdiffstats
path: root/fs/afs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-22 15:40:57 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2016-01-22 18:04:28 -0500
commit5955102c9984fa081b2d570cfac75c97eecf8f3b (patch)
treea4744386eac4b916e847eb4eedfada158f6527b4 /fs/afs
parent57b8f112cfe6622ddddb8c2641206bb5fa8a112d (diff)
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>
Diffstat (limited to 'fs/afs')
-rw-r--r--fs/afs/flock.c4
-rw-r--r--fs/afs/write.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/afs/flock.c b/fs/afs/flock.c
index 4baf1d2b39e4..d91a9c9cfbd0 100644
--- a/fs/afs/flock.c
+++ b/fs/afs/flock.c
@@ -483,7 +483,7 @@ static int afs_do_getlk(struct file *file, struct file_lock *fl)
483 483
484 fl->fl_type = F_UNLCK; 484 fl->fl_type = F_UNLCK;
485 485
486 mutex_lock(&vnode->vfs_inode.i_mutex); 486 inode_lock(&vnode->vfs_inode);
487 487
488 /* check local lock records first */ 488 /* check local lock records first */
489 ret = 0; 489 ret = 0;
@@ -505,7 +505,7 @@ static int afs_do_getlk(struct file *file, struct file_lock *fl)
505 } 505 }
506 506
507error: 507error:
508 mutex_unlock(&vnode->vfs_inode.i_mutex); 508 inode_unlock(&vnode->vfs_inode);
509 _leave(" = %d [%hd]", ret, fl->fl_type); 509 _leave(" = %d [%hd]", ret, fl->fl_type);
510 return ret; 510 return ret;
511} 511}
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 0714abcd7f32..dfef94f70667 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -693,7 +693,7 @@ int afs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
693 ret = filemap_write_and_wait_range(inode->i_mapping, start, end); 693 ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
694 if (ret) 694 if (ret)
695 return ret; 695 return ret;
696 mutex_lock(&inode->i_mutex); 696 inode_lock(inode);
697 697
698 /* use a writeback record as a marker in the queue - when this reaches 698 /* use a writeback record as a marker in the queue - when this reaches
699 * the front of the queue, all the outstanding writes are either 699 * the front of the queue, all the outstanding writes are either
@@ -735,7 +735,7 @@ int afs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
735 afs_put_writeback(wb); 735 afs_put_writeback(wb);
736 _leave(" = %d", ret); 736 _leave(" = %d", ret);
737out: 737out:
738 mutex_unlock(&inode->i_mutex); 738 inode_unlock(inode);
739 return ret; 739 return ret;
740} 740}
741 741