Skip to contentSkip to conversation

locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING

PATCH In review Jeff Layton 2 participants 2 messages Sep 24, 2014 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 include/linux/fs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/fs.h +2 -2
index bb9484ae1eef..2023306c620e 100644
@@ -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)
Signature · 1 line
1.9.3