aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Marshall <hubcap@omnibond.com>2016-10-03 15:07:36 -0400
committerMike Marshall <hubcap@omnibond.com>2016-10-03 15:07:36 -0400
commitf60fbdbf41c802e45c03e02ef824772c539ac965 (patch)
treee7a0f9fc5a5de98fc2c5194c0c69e2ed9141527b
parent5891b4fe6387c3d86400ed4174d7c7389b784a97 (diff)
Revert "orangefs: bump minimum userspace version"
The features op did make it into OrangeFS 2.9.6 after all. This reverts commit 0c95ad76361f1d75a1ffdf82deafbcec44d19c42.
-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)
251 251
252 op_release(new_op); 252 op_release(new_op);
253 253
254 if (orangefs_userspace_version >= 20907) { 254 if (orangefs_userspace_version >= 20906) {
255 new_op = op_alloc(ORANGEFS_VFS_OP_FEATURES); 255 new_op = op_alloc(ORANGEFS_VFS_OP_FEATURES);
256 if (!new_op) 256 if (!new_op)
257 return -ENOMEM; 257 return -ENOMEM;
@@ -507,7 +507,7 @@ struct dentry *orangefs_mount(struct file_system_type *fst,
507 spin_unlock(&orangefs_superblocks_lock); 507 spin_unlock(&orangefs_superblocks_lock);
508 op_release(new_op); 508 op_release(new_op);
509 509
510 if (orangefs_userspace_version >= 20907) { 510 if (orangefs_userspace_version >= 20906) {
511 new_op = op_alloc(ORANGEFS_VFS_OP_FEATURES); 511 new_op = op_alloc(ORANGEFS_VFS_OP_FEATURES);
512 if (!new_op) 512 if (!new_op)
513 return ERR_PTR(-ENOMEM); 513 return ERR_PTR(-ENOMEM);