aboutsummaryrefslogtreecommitdiffstats
path: root/fs/orangefs/orangefs-kernel.h
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2016-09-28 14:47:29 -0400
committerMartin Brandenburg <martin@omnibond.com>2016-09-28 14:47:29 -0400
commitf808e138c0abd99bfce90ec8d4ef6406c2af714a (patch)
treebe66f4beb9de1b2fecbf1e59950fe714184c8ecb /fs/orangefs/orangefs-kernel.h
parentMerge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux (diff)
parentorangefs: bump minimum userspace version (diff)
downloadlinux-dev-f808e138c0abd99bfce90ec8d4ef6406c2af714a.tar.xz
linux-dev-f808e138c0abd99bfce90ec8d4ef6406c2af714a.zip
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/orangefs-kernel.h')
-rw-r--r--fs/orangefs/orangefs-kernel.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 633c07a6e3d8..6cf3f467fd89 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -447,6 +447,8 @@ void purge_waiting_ops(void);
/*
* defined in super.c
*/
+extern uint64_t orangefs_features;
+
struct dentry *orangefs_mount(struct file_system_type *fst,
int flags,
const char *devname,
@@ -506,6 +508,8 @@ ssize_t orangefs_inode_read(struct inode *inode,
/*
* defined in devorangefs-req.c
*/
+extern uint32_t orangefs_userspace_version;
+
int orangefs_dev_init(void);
void orangefs_dev_cleanup(void);
int is_daemon_in_service(void);