Merge tag 'md/4.5' of git://neil.brown.name/md

[linux-beck.git] / fs / 9p / cache.c

diff --git a/fs/9p/cache.c b/fs/9p/cache.c
index a69260f27555df85894618dc1647422971914dc4..103ca5e1267beb2229999e0711e50ba83f4c0abb 100644 (file)
--- a/fs/9p/cache.c
+++ b/fs/9p/cache.c
@@ -243,14 +243,14 @@ void v9fs_cache_inode_set_cookie(struct inode *inode, struct file *filp)
        if (!v9inode->fscache)
                return;
 
-       spin_lock(&v9inode->fscache_lock);
+       mutex_lock(&v9inode->fscache_lock);
 
        if ((filp->f_flags & O_ACCMODE) != O_RDONLY)
                v9fs_cache_inode_flush_cookie(inode);
        else
                v9fs_cache_inode_get_cookie(inode);
 
-       spin_unlock(&v9inode->fscache_lock);
+       mutex_unlock(&v9inode->fscache_lock);
 }
 
 void v9fs_cache_inode_reset_cookie(struct inode *inode)
@@ -264,7 +264,7 @@ void v9fs_cache_inode_reset_cookie(struct inode *inode)
 
        old = v9inode->fscache;
 
-       spin_lock(&v9inode->fscache_lock);
+       mutex_lock(&v9inode->fscache_lock);
        fscache_relinquish_cookie(v9inode->fscache, 1);
 
        v9ses = v9fs_inode2v9ses(inode);
@@ -274,7 +274,7 @@ void v9fs_cache_inode_reset_cookie(struct inode *inode)
        p9_debug(P9_DEBUG_FSC, "inode %p revalidating cookie old %p new %p\n",
                 inode, old, v9inode->fscache);
 
-       spin_unlock(&v9inode->fscache_lock);
+       mutex_unlock(&v9inode->fscache_lock);
 }
 
 int __v9fs_fscache_release_page(struct page *page, gfp_t gfp)