Merge branch 'master' into gfio

[fio.git] / init.c

diff --git a/init.c b/init.c
index 6604a18f2f3750f71811760f3bba2c96e44368ec..c5dcb7fcd59487e61d71b84e6f4e7491e71c5a91 100644 (file)
--- a/init.c
+++ b/init.c
@@ -261,7 +261,7 @@ static int setup_thread_area(void)
                shm_id = shmget(0, size, IPC_CREAT | 0600);
                if (shm_id != -1)
                        break;
-               if (errno != EINVAL && errno != ENOMEM) {
+               if (errno != EINVAL && errno != ENOMEM && errno != ENOSPC) {
                        perror("shmget");
                        break;
                }
@@ -1198,7 +1198,7 @@ static int fill_def_thread(void)
 
        fio_getaffinity(getpid(), &def_thread.o.cpumask);
        def_thread.o.timeout = def_timeout;
-
+       def_thread.o.error_dump = 1;
        /*
         * fill default options
         */