summaryrefslogtreecommitdiff
path: root/fs/hfs/dir.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2016-01-25 21:46:21 +0300
committerTony Lindgren <tony@atomide.com>2016-01-25 21:46:21 +0300
commit7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch)
treecd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /fs/hfs/dir.c
parent143c6fe3a415edf2dde3f507b3a00998b4c4001e (diff)
parent20437f79f6627a31752f422688a6047c25cefcf1 (diff)
downloadlinux-7e3b1207705c10ada363bbc7d0235730ce1f5b79.tar.xz
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'fs/hfs/dir.c')
-rw-r--r--fs/hfs/dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 70788e03820a..e9f2b855f831 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -173,9 +173,9 @@ static int hfs_dir_release(struct inode *inode, struct file *file)
{
struct hfs_readdir_data *rd = file->private_data;
if (rd) {
- mutex_lock(&inode->i_mutex);
+ inode_lock(inode);
list_del(&rd->list);
- mutex_unlock(&inode->i_mutex);
+ inode_unlock(inode);
kfree(rd);
}
return 0;