diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2013-03-19 11:24:18 +0100 |
---|---|---|
committer | Joe MacDonald <joe.macdonald@windriver.com> | 2013-03-21 09:54:51 -0400 |
commit | 022fe03271eaaebc8ecfa01961169a4e642783ee (patch) | |
tree | 1e8705007297b79e4649cbbfb797db9adef77d14 /meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-map-entry-duplicate-offset-detection.patch | |
parent | 20ccd38f869a772ec5b2718742eb350427e5187f (diff) | |
download | meta-openembedded-022fe03271eaaebc8ecfa01961169a4e642783ee.tar.gz |
autofs: update to current patchlevel
* Apply all patches from ftp.kernel.org/pub/linux/daemons/autofs/v5/patches-5.0.8/
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com>
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-map-entry-duplicate-offset-detection.patch')
-rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-map-entry-duplicate-offset-detection.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-map-entry-duplicate-offset-detection.patch b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-map-entry-duplicate-offset-detection.patch new file mode 100644 index 0000000000..126d9a25b0 --- /dev/null +++ b/meta-networking/recipes-daemons/autofs/autofs-5.0.7/autofs-5.0.7-fix-map-entry-duplicate-offset-detection.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | autofs-5.0.7 - fix map entry duplicate offset detection | ||
2 | |||
3 | From: Ian Kent <raven@themaw.net> | ||
4 | |||
5 | Recent changes broke the detection of duplicate offsets in map entries. | ||
6 | --- | ||
7 | |||
8 | CHANGELOG | 1 + | ||
9 | lib/cache.c | 2 +- | ||
10 | 2 files changed, 2 insertions(+), 1 deletions(-) | ||
11 | |||
12 | |||
13 | diff --git a/CHANGELOG b/CHANGELOG | ||
14 | index 8f6bb3a..bd0dd82 100644 | ||
15 | --- a/CHANGELOG | ||
16 | +++ b/CHANGELOG | ||
17 | @@ -15,6 +15,7 @@ | ||
18 | - fix recursive mount deadlock. | ||
19 | - increase file map read buffer size. | ||
20 | - handle new location of systemd. | ||
21 | +- fix map entry duplicate offset detection. | ||
22 | |||
23 | 25/07/2012 autofs-5.0.7 | ||
24 | ======================= | ||
25 | diff --git a/lib/cache.c b/lib/cache.c | ||
26 | index 9179ad5..1e05a99 100644 | ||
27 | --- a/lib/cache.c | ||
28 | +++ b/lib/cache.c | ||
29 | @@ -659,7 +659,7 @@ int cache_update_offset(struct mapent_cache *mc, const char *mkey, const char *k | ||
30 | |||
31 | me = cache_lookup_distinct(mc, key); | ||
32 | if (me && me->age == age) { | ||
33 | - if (me->multi != owner) | ||
34 | + if (me->multi == owner) | ||
35 | return CHE_DUPLICATE; | ||
36 | } | ||
37 | |||