diff options
| -rw-r--r-- | src/kernel/caps.c | 7 | ||||
| -rw-r--r-- | src/kernel/super.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/kernel/caps.c b/src/kernel/caps.c index 06756cc1da0..4e338083183 100644 --- a/src/kernel/caps.c +++ b/src/kernel/caps.c @@ -822,8 +822,13 @@ retry_locked: * Reschedule delayed caps release, unless we are called from * the delayed work handler (i.e. this _is_ the delayed release) */ - if (!is_delayed) + if (!is_delayed) { __cap_delay_requeue(mdsc, ci); + } else if (ci->i_ceph_flags & CEPH_I_NEW) { + spin_unlock(&inode->i_lock); + ceph_pending_flush(d_find_alias(inode)); + return; + } /* * If we no longer need to hold onto old our caps, and we may diff --git a/src/kernel/super.c b/src/kernel/super.c index d7d241b50a0..79e5d620a4c 100644 --- a/src/kernel/super.c +++ b/src/kernel/super.c @@ -484,7 +484,7 @@ static int parse_mount_args(int flags, char *options, const char *dev_name, args->default_layout.fl_stripe_count = 1; args->default_layout.fl_object_size = 4 << 20; args->default_layout.fl_pg_preferred = -1; - args->default_layout.fl_pg_type = CEPH_PG_LAYOUT_CRUSH; + args->default_layout.fl_pg_type = CEPH_PG_TYPE_REP; args->default_layout.fl_pg_size = 2; args->default_layout.fl_pg_pool = 1; |