summaryrefslogtreecommitdiffstats
path: root/fs/orangefs
diff options
context:
space:
mode:
authorMike Marshall <hubcap@omnibond.com>2016-10-03 21:07:36 +0200
committerMike Marshall <hubcap@omnibond.com>2016-10-03 21:07:36 +0200
commitf60fbdbf41c802e45c03e02ef824772c539ac965 (patch)
treee7a0f9fc5a5de98fc2c5194c0c69e2ed9141527b /fs/orangefs
parentMerge tag 'for-hubcap-v4.9-more' into for-next (diff)
downloadlinux-f60fbdbf41c802e45c03e02ef824772c539ac965.tar.xz
linux-f60fbdbf41c802e45c03e02ef824772c539ac965.zip
Revert "orangefs: bump minimum userspace version"
The features op did make it into OrangeFS 2.9.6 after all. This reverts commit 0c95ad76361f1d75a1ffdf82deafbcec44d19c42.
Diffstat (limited to 'fs/orangefs')
-rw-r--r--fs/orangefs/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index 166f3a59d2e4..c48859f16e7b 100644
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -251,7 +251,7 @@ int orangefs_remount(struct orangefs_sb_info_s *orangefs_sb)
op_release(new_op);
- if (orangefs_userspace_version >= 20907) {
+ if (orangefs_userspace_version >= 20906) {
new_op = op_alloc(ORANGEFS_VFS_OP_FEATURES);
if (!new_op)
return -ENOMEM;
@@ -507,7 +507,7 @@ struct dentry *orangefs_mount(struct file_system_type *fst,
spin_unlock(&orangefs_superblocks_lock);
op_release(new_op);
- if (orangefs_userspace_version >= 20907) {
+ if (orangefs_userspace_version >= 20906) {
new_op = op_alloc(ORANGEFS_VFS_OP_FEATURES);
if (!new_op)
return ERR_PTR(-ENOMEM);