diff options
| author | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 21:47:29 +0300 |
|---|---|---|
| committer | Martin Brandenburg <martin@omnibond.com> | 2016-09-28 21:47:29 +0300 |
| commit | f808e138c0abd99bfce90ec8d4ef6406c2af714a (patch) | |
| tree | be66f4beb9de1b2fecbf1e59950fe714184c8ecb /fs/orangefs/orangefs-kernel.h | |
| parent | a21aae3bb15a1d08040bdcf5a73504c0da9f5080 (diff) | |
| parent | 0c95ad76361f1d75a1ffdf82deafbcec44d19c42 (diff) | |
| download | linux-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/orangefs-kernel.h')
| -rw-r--r-- | fs/orangefs/orangefs-kernel.h | 4 |
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); |