diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
| commit | 76b36fa896a2db64582690e085f36adc76604134 (patch) | |
| tree | 78007f123ead6f96cdee6ba98ac3c289c706cc39 /fs/9p/vfs_inode.c | |
| parent | 14365449b6ce34cf6a3040ff8ebbb39d89d67159 (diff) | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | linux-76b36fa896a2db64582690e085f36adc76604134.tar.xz | |
Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/9p/vfs_inode.c')
| -rw-r--r-- | fs/9p/vfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index c7cc7c30f0c8..3a08b3e6ff1d 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -244,7 +244,7 @@ struct inode *v9fs_alloc_inode(struct super_block *sb) return NULL; #ifdef CONFIG_9P_FSCACHE v9inode->fscache = NULL; - spin_lock_init(&v9inode->fscache_lock); + mutex_init(&v9inode->fscache_lock); #endif v9inode->writeback_fid = NULL; v9inode->cache_validity = 0; |