diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /linux-uml/linux-uml-2.4.26/10-flock.patch | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'linux-uml/linux-uml-2.4.26/10-flock.patch')
| -rw-r--r-- | linux-uml/linux-uml-2.4.26/10-flock.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/linux-uml/linux-uml-2.4.26/10-flock.patch b/linux-uml/linux-uml-2.4.26/10-flock.patch deleted file mode 100644 index c64b34d8be..0000000000 --- a/linux-uml/linux-uml-2.4.26/10-flock.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: linux-2.4.24-2/arch/um/os-Linux/file.c ---- linux-2.4.24-2/arch/um/os-Linux/file.c 7 Apr 2004 20:44:49 -0000 1.29 -+++ linux-2.4.24-2/arch/um/os-Linux/file.c 17 May 2004 18:35:49 -0000 -@@ -688,6 +688,7 @@ - - int os_lock_file(int fd, int excl) - { -+#if USE_FCNTL_LOCK - int type = excl ? F_WRLCK : F_RDLCK; - struct flock lock = ((struct flock) { .l_type = type, - .l_whence = SEEK_SET, -@@ -710,6 +711,21 @@ - err = save; - out: - return(err); -+#else -+ int type = excl ? LOCK_EX : LOCK_SH; -+ int err, save; -+ -+ err = flock(fd, type | LOCK_NB); -+ if(!err) -+ goto out; -+ -+ save = -errno; -+ -+ printk("file already locked\n"); -+ err = save; -+ out: -+ return(err); -+#endif - } - - int os_ftruncate(int fd, __u64 size) |