summaryrefslogtreecommitdiff
path: root/fs/orangefs/downcall.h
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2016-09-28 21:47:29 +0300
committerMartin Brandenburg <martin@omnibond.com>2016-09-28 21:47:29 +0300
commitf808e138c0abd99bfce90ec8d4ef6406c2af714a (patch)
treebe66f4beb9de1b2fecbf1e59950fe714184c8ecb /fs/orangefs/downcall.h
parenta21aae3bb15a1d08040bdcf5a73504c0da9f5080 (diff)
parent0c95ad76361f1d75a1ffdf82deafbcec44d19c42 (diff)
downloadlinux-f808e138c0abd99bfce90ec8d4ef6406c2af714a.tar.xz
Merge branch 'features' into for-next
Pull in an OrangeFS branch containing improvements which the userspace component and the kernel to negotiate mutually supported features.
Diffstat (limited to 'fs/orangefs/downcall.h')
-rw-r--r--fs/orangefs/downcall.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/orangefs/downcall.h b/fs/orangefs/downcall.h
index db6e8722a89e..3b8923f8bf21 100644
--- a/fs/orangefs/downcall.h
+++ b/fs/orangefs/downcall.h
@@ -101,6 +101,11 @@ struct orangefs_fs_key_response {
char fs_key[FS_KEY_BUF_SIZE];
};
+/* 2.9.6 */
+struct orangefs_features_response {
+ __u64 features;
+};
+
struct orangefs_downcall_s {
__s32 type;
__s32 status;
@@ -122,6 +127,7 @@ struct orangefs_downcall_s {
struct orangefs_param_response param;
struct orangefs_perf_count_response perf_count;
struct orangefs_fs_key_response fs_key;
+ struct orangefs_features_response features;
} resp;
};