[systemd-commits] 2 commits - TODO src/readahead src/tmpfiles

[Lennart Poettering]

 TODO                             |    2 ++
 src/readahead/readahead-common.c |    6 +++++-
 src/tmpfiles/tmpfiles.c          |    2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 3612fbc1e4ae57af0783cc82a56917bcd29a0431
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Wed Sep 12 16:21:00 2012 -0400

    tmpfiles: plug file descriptor leak.
    
    Introduced in d4e9eb91.

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 70de06b..ed51ec8 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -528,6 +528,8 @@ static int write_one_file(Item *i, const char *path) {
                 }
         }
 
+        close_nointr_nofail(fd);
+
         if (stat(path, &st) < 0) {
                 log_error("stat(%s) failed: %m", path);
                 return -errno;

commit a8b10efaec5005b8e4fcc2bebdf86993ad14993d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Sep 13 00:06:30 2012 +0200

    readahead: use 20K instead of 16K as temporary request nr bump

diff --git a/TODO b/TODO
index ecd5f99..e56ab1f 100644
--- a/TODO
+++ b/TODO
@@ -53,6 +53,8 @@ Bugfixes:
 
 Features:
 
++ refuse automount triggers when automount is queued for stop, much like we refuse socket triggers when sockets are queued for stop
+
 * perfomance messages for selinux are gone from debug log?
 
 * http://lists.freedesktop.org/archives/systemd-devel/2012-September/006502.html
diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c
index 766b3a1..10b0ccc 100644
--- a/src/readahead/readahead-common.c
+++ b/src/readahead/readahead-common.c
@@ -214,7 +214,11 @@ finish:
         return m;
 }
 
-#define BUMP_REQUEST_NR (16*1024)
+/* We use 20K instead of the more human digestable 16K here. Why?
+   Simply so that it is more unlikely that users end up picking this
+   value too so that we can recognize better whether the user changed
+   the value while we had it temporarily bumped. */
+#define BUMP_REQUEST_NR (20*1024)
 
 int block_bump_request_nr(const char *p) {
         struct stat st;