Clear sysfs path before reading current ioscheduler from sysfs

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index 2aa88403da00600c5a1b8713572aa5840eb7dba3..207b509d2698f724baf44b94b4a0518ba065b737 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -1172,13 +1172,17 @@ static int switch_ioscheduler(struct thread_data *td)
        /*
         * Read back and check that the selected scheduler is now the default.
         */
        /*
         * Read back and check that the selected scheduler is now the default.
         */

+       memset(tmp, 0, sizeof(tmp));

        ret = fread(tmp, sizeof(tmp), 1, f);
        if (ferror(f) || ret < 0) {
                td_verror(td, errno, "fread");
                fclose(f);
                return 1;
        }
        ret = fread(tmp, sizeof(tmp), 1, f);
        if (ferror(f) || ret < 0) {
                td_verror(td, errno, "fread");
                fclose(f);
                return 1;
        }

-       tmp[sizeof(tmp) - 1] = '\0';
+       /*
+        * either a list of io schedulers or "none\n" is expected.
+        */
+       tmp[strlen(tmp) - 1] = '\0';

 
 
        sprintf(tmp2, "[%s]", td->o.ioscheduler);
 
 
        sprintf(tmp2, "[%s]", td->o.ioscheduler);