diff options
| author | Sage Weil | 2009-11-13 00:07:24 +0100 |
|---|---|---|
| committer | Sage Weil | 2009-11-13 00:57:05 +0100 |
| commit | 11ea8eda064aa4dc6e44a6dade1891b69ebd5255 (patch) | |
| tree | e7def548d1d80e38710cc7d1fe30d4b2cd37d56f /fs/ceph/caps.c | |
| parent | ceph: build cleanly without CONFIG_DEBUG_FS (diff) | |
| download | kernel-qcow2-linux-11ea8eda064aa4dc6e44a6dade1891b69ebd5255.tar.gz kernel-qcow2-linux-11ea8eda064aa4dc6e44a6dade1891b69ebd5255.tar.xz kernel-qcow2-linux-11ea8eda064aa4dc6e44a6dade1891b69ebd5255.zip | |
ceph: fix page invalidation deadlock
We occasionally want to make a best-effort attempt to invalidate cache
pages without fear of blocking. If this fails, we fall back to an async
invalidate in another thread.
Use invalidate_mapping_pages instead of invalidate_inode_page2, as that
will skip locked pages, and not deadlock.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/caps.c')
| -rw-r--r-- | fs/ceph/caps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index d8132b6e770d..9dd110602cda 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1440,7 +1440,7 @@ retry_locked: dout("check_caps trying to invalidate on %p\n", inode); spin_unlock(&inode->i_lock); - ret = invalidate_inode_pages2(&inode->i_data); + ret = invalidate_mapping_pages(&inode->i_data, 0, -1); spin_lock(&inode->i_lock); if (ret == 0 && invalidating_gen == ci->i_rdcache_gen) { /* success. */ @@ -2180,7 +2180,7 @@ restart: spin_unlock(&inode->i_lock); tried_invalidate = 1; - ret = invalidate_inode_pages2(&inode->i_data); + ret = invalidate_mapping_pages(&inode->i_data, 0, -1); spin_lock(&inode->i_lock); if (ret < 0) { /* there were locked pages.. invalidate later |