diff options
| author | Sage Weil <sage@newdream.net> | 2010-07-30 09:38:13 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-08-01 20:11:42 -0700 |
| commit | 2d9c98ae97c18e8b1c363af6a2e51d5d9e8c5e04 (patch) | |
| tree | 694895b1c66c7a1f382f8e7b6bc8c1b53165eab1 | |
| parent | b8cd07e78eaa49857e882f4199309f86aeb80bbd (diff) | |
| download | blackbird-op-linux-2d9c98ae97c18e8b1c363af6a2e51d5d9e8c5e04.tar.gz blackbird-op-linux-2d9c98ae97c18e8b1c363af6a2e51d5d9e8c5e04.zip | |
ceph: make ->sync_fs not wait if wait==0
The ->sync_fs() super op only needs to wait if wait is true. Otherwise,
just get some dirty cap writeback started.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/super.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index d80699a4dc26..7f751f2850ba 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -102,12 +102,21 @@ static int ceph_statfs(struct dentry *dentry, struct kstatfs *buf) } -static int ceph_syncfs(struct super_block *sb, int wait) +static int ceph_sync_fs(struct super_block *sb, int wait) { - dout("sync_fs %d\n", wait); + struct ceph_client *client = ceph_sb_to_client(sb); + + if (!wait) { + dout("sync_fs (non-blocking)\n"); + ceph_flush_dirty_caps(&client->mdsc); + dout("sync_fs (non-blocking) done\n"); + return 0; + } + + dout("sync_fs (blocking)\n"); ceph_osdc_sync(&ceph_sb_to_client(sb)->osdc); ceph_mdsc_sync(&ceph_sb_to_client(sb)->mdsc); - dout("sync_fs %d done\n", wait); + dout("sync_fs (blocking) done\n"); return 0; } @@ -278,7 +287,7 @@ static const struct super_operations ceph_super_ops = { .alloc_inode = ceph_alloc_inode, .destroy_inode = ceph_destroy_inode, .write_inode = ceph_write_inode, - .sync_fs = ceph_syncfs, + .sync_fs = ceph_sync_fs, .put_super = ceph_put_super, .show_options = ceph_show_options, .statfs = ceph_statfs, |
