From: Mike Marshall <hubcap@omnibond.com>
Date: Mon, 3 Oct 2016 19:07:36 +0000 (-0400)
Subject: Revert "orangefs: bump minimum userspace version"
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f60fbdbf41c802e45c03e02ef824772c539ac965;p=linux-beck.git

Revert "orangefs: bump minimum userspace version"

The features op did make it into OrangeFS 2.9.6 after all.

This reverts commit 0c95ad76361f1d75a1ffdf82deafbcec44d19c42.
---

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);