diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-02-22 20:12:13 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-22 20:12:13 +0900 |
| commit | 8174b35f1d9b54b740a935410c7b3891e3e2a119 (patch) | |
| tree | 95427a4dd7248c41547a9a8d4afcfe7aa9a3a9fd /fs/cachefiles/interface.c | |
| parent | ASoC: mediatek: Enable 33bit memory address to support 4GB DRAM (diff) | |
| parent | Linux 4.5-rc5 (diff) | |
| download | wireguard-linux-8174b35f1d9b54b740a935410c7b3891e3e2a119.tar.xz wireguard-linux-8174b35f1d9b54b740a935410c7b3891e3e2a119.zip | |
Merge tag 'v4.5-rc5' into asoc-mtk
Linux 4.5-rc5
Diffstat (limited to 'fs/cachefiles/interface.c')
| -rw-r--r-- | fs/cachefiles/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cachefiles/interface.c b/fs/cachefiles/interface.c index afa023dded5b..675a3332d72f 100644 --- a/fs/cachefiles/interface.c +++ b/fs/cachefiles/interface.c @@ -446,7 +446,7 @@ static int cachefiles_attr_changed(struct fscache_object *_object) return 0; cachefiles_begin_secure(cache, &saved_cred); - mutex_lock(&d_inode(object->backer)->i_mutex); + inode_lock(d_inode(object->backer)); /* if there's an extension to a partial page at the end of the backing * file, we need to discard the partial page so that we pick up new @@ -465,7 +465,7 @@ static int cachefiles_attr_changed(struct fscache_object *_object) ret = notify_change(object->backer, &newattrs, NULL); truncate_failed: - mutex_unlock(&d_inode(object->backer)->i_mutex); + inode_unlock(d_inode(object->backer)); cachefiles_end_secure(cache, saved_cred); if (ret == -EIO) { |