diff --git a/[refs] b/[refs] index 0d21a93e10ae..5ef0951bf961 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20cb34ae9e4b008a8789a48d52f5aa279dc400b6 +refs/heads/master: c6f3fdc592d61847da0e2172e352dbcb53c83d39 diff --git a/trunk/fs/ceph/super.h b/trunk/fs/ceph/super.h index 281e458db8b3..83f7cc5fab10 100644 --- a/trunk/fs/ceph/super.h +++ b/trunk/fs/ceph/super.h @@ -33,7 +33,7 @@ /* * Supported features */ -#define CEPH_FEATURE_SUPPORTED CEPH_FEATURE_NOSRCADDR +#define CEPH_FEATURE_SUPPORTED CEPH_FEATURE_NOSRCADDR | CEPH_FEATURE_FLOCK #define CEPH_FEATURE_REQUIRED CEPH_FEATURE_NOSRCADDR /*