From 3a8a83c061965195c4842d89b888e37cd4b33ee3 Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Fri, 14 Jul 2006 15:53:05 +0000 Subject: [PATCH] linux-posix-lock-file-api-fix-20060714 fix lock enrollment for older kernels --- src/afs/LINUX/osi_vnodeops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index b88c62d99..b8d46a02a 100644 --- a/src/afs/LINUX/osi_vnodeops.c +++ b/src/afs/LINUX/osi_vnodeops.c @@ -463,12 +463,14 @@ afs_linux_lock(struct file *fp, int cmd, struct file_lock *flp) #ifdef AFS_LINUX24_ENV if (code == 0 && (cmd == F_SETLK || cmd == F_SETLKW)) { +#ifdef AFS_LINUX26_ENV struct file_lock flp2; flp2 = *flp; -#ifdef AFS_LINUX26_ENV flp2.fl_flags &=~ FL_SLEEP; -#endif code = posix_lock_file(fp, &flp2); +#else + code = posix_lock_file(fp, flp, 0); +#endif osi_Assert(code != -EAGAIN); /* there should be no conflicts */ if (code) { struct AFS_FLOCK flock2; -- 2.39.5