From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030565AbVKRJ5A (ORCPT ); Fri, 18 Nov 2005 04:57:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030600AbVKRJ5A (ORCPT ); Fri, 18 Nov 2005 04:57:00 -0500 Received: from mx1.suse.de ([195.135.220.2]:49570 "EHLO mx1.suse.de") by vger.kernel.org with ESMTP id S1030565AbVKRJ47 (ORCPT ); Fri, 18 Nov 2005 04:56:59 -0500 From: NeilBrown To: Andrew Morton Date: Fri, 18 Nov 2005 20:56:45 +1100 Message-Id: <1051118095645.17025@suse.de> X-face: [Gw_3E*Gng}4rRrKRYotwlE?.2|**#s9D Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Finally got some testing done on this, and it wasn't quite right. We need to return information from F_GETLK no-matter what l_type is - at the very least we return a value in l_type, but might return start/length as well. This patch has been tested (LSB test suite), and works. Signed-off-by: Neil Brown ### Diffstat output ./fs/compat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff ./fs/compat.c~current~ ./fs/compat.c --- ./fs/compat.c~current~ 2005-11-18 11:49:08.000000000 +1100 +++ ./fs/compat.c 2005-11-18 11:49:57.000000000 +1100 @@ -493,9 +493,9 @@ asmlinkage long compat_sys_fcntl64(unsig set_fs(KERNEL_DS); ret = sys_fcntl(fd, cmd, (unsigned long)&f); set_fs(old_fs); - if (cmd == F_GETLK && ret == 0 && f.l_type == F_UNLCK) { - /* there was a conflicting lock, and we need to return - * the data... but it needs to fit in the compat structure. + if (cmd == F_GETLK && ret == 0) { + /* GETLK was successfule and we need to return the data... + * but it needs to fit in the compat structure. * l_start shouldn't be too big, unless the original * start + end is greater than COMPAT_OFF_T_MAX, in which * case the app was asking for trouble, so we return @@ -526,7 +526,7 @@ asmlinkage long compat_sys_fcntl64(unsig ((cmd == F_SETLK64) ? F_SETLK : F_SETLKW), (unsigned long)&f); set_fs(old_fs); - if (cmd == F_GETLK64 && ret == 0 && f.l_type == F_UNLCK) { + if (cmd == F_GETLK64 && ret == 0) { /* need to return lock information - see above for commentary */ if (f.l_start > COMPAT_LOFF_T_MAX) ret = -EOVERFLOW;