diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-03 11:30:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-03 11:30:36 +0100 |
commit | 03e075b38e6cd25267c8d6e2797fa4537ca3348d (patch) | |
tree | 608ece74f1b3cca290e3408a29cf73e822f0ef4d /fs/nilfs2/ioctl.c | |
parent | 753b11ef8e92a1c1bbe97f2a5ec14bdd1ef2e6fe (diff) | |
parent | 34229b277480f46c1e9a19f027f30b074512e68b (diff) | |
download | linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.tar.bz2 |
Merge branch 'linus' into efi/core, to refresh the branch and to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nilfs2/ioctl.c')
-rw-r--r-- | fs/nilfs2/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index aba43811d6ef..e8fe24882b5b 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c @@ -158,7 +158,7 @@ static int nilfs_ioctl_setflags(struct inode *inode, struct file *filp, flags = nilfs_mask_flags(inode->i_mode, flags); - mutex_lock(&inode->i_mutex); + inode_lock(inode); oldflags = NILFS_I(inode)->i_flags; @@ -186,7 +186,7 @@ static int nilfs_ioctl_setflags(struct inode *inode, struct file *filp, nilfs_mark_inode_dirty(inode); ret = nilfs_transaction_commit(inode->i_sb); out: - mutex_unlock(&inode->i_mutex); + inode_unlock(inode); mnt_drop_write_file(filp); return ret; } |