From 1b2b32dcdb3df28dd103033c73cac2417fa05845 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 24 Sep 2014 08:38:44 -0400 Subject: [PATCH] locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING Currently they both just return 0. Fix them to return more appropriate values instead. For better or worse, most places in the kernel return -EINVAL when leases aren't available. -ENOLCK would probably have been better, but let's follow suit here in the case of F_SETLEASE. In the F_GETLEASE case, just return F_UNLCK since we know that no lease will have been set. Signed-off-by: Jeff Layton Reviewed-by: Christoph Hellwig --- include/linux/fs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index bb9484a..2023306 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1008,12 +1008,12 @@ static inline int fcntl_setlk64(unsigned int fd, struct file *file, #endif static inline int fcntl_setlease(unsigned int fd, struct file *filp, long arg) { - return 0; + return -EINVAL; } static inline int fcntl_getlease(struct file *filp) { - return 0; + return F_UNLCK; } static inline void locks_init_lock(struct file_lock *fl) -- 2.7.4