diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/linux-uml/linux-uml-2.4.26/10-flock.patch | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/linux-uml/linux-uml-2.4.26/10-flock.patch')
-rw-r--r-- | packages/linux-uml/linux-uml-2.4.26/10-flock.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/packages/linux-uml/linux-uml-2.4.26/10-flock.patch b/packages/linux-uml/linux-uml-2.4.26/10-flock.patch deleted file mode 100644 index c64b34d8be..0000000000 --- a/packages/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) |