diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-08 07:14:30 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-08 07:14:30 +0300 |
commit | b79675e15a754ca51b9fc631e0961ccdd4ec3fc7 (patch) | |
tree | 7df53cef573ef848ba5005475d66dae47ee3cde1 /fs/ocfs2/dlmfs/userdlm.h | |
parent | d57b2b5bc4301f37d1b07e3351d575bd634c7300 (diff) | |
parent | 6414e9b09ffd197803f8e86ce2fafdaf1de4e8e4 (diff) | |
download | linux-b79675e15a754ca51b9fc631e0961ccdd4ec3fc7.tar.xz |
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"No common topic whatsoever in those, sorry"
* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: define inode flags using bit numbers
iov_iter: Move unnecessary inclusion of crypto/hash.h
dlmfs: clean up dlmfs_file_{read,write}() a bit
Diffstat (limited to 'fs/ocfs2/dlmfs/userdlm.h')
-rw-r--r-- | fs/ocfs2/dlmfs/userdlm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ocfs2/dlmfs/userdlm.h b/fs/ocfs2/dlmfs/userdlm.h index 4bef7cdef859..0558ae768200 100644 --- a/fs/ocfs2/dlmfs/userdlm.h +++ b/fs/ocfs2/dlmfs/userdlm.h @@ -66,9 +66,7 @@ void user_dlm_cluster_unlock(struct user_lock_res *lockres, void user_dlm_write_lvb(struct inode *inode, const char *val, unsigned int len); -ssize_t user_dlm_read_lvb(struct inode *inode, - char *val, - unsigned int len); +bool user_dlm_read_lvb(struct inode *inode, char *val); struct ocfs2_cluster_connection *user_dlm_register(const struct qstr *name); void user_dlm_unregister(struct ocfs2_cluster_connection *conn); void user_dlm_set_locking_protocol(void); |