diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 17:42:56 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 17:42:56 +0300 |
| commit | f10698ed6807dc41d021fb7baeb24f9bc4051837 (patch) | |
| tree | fe9229efe38ad31788843a7535bfc3feb89f79a7 /tools/lib/api/fs | |
| parent | 86038c5ea81b519a8a1fcfcd5e4599aab0cdd119 (diff) | |
| parent | e742f3dc0886a92403d578e8ac771e5e33d06d08 (diff) | |
| download | linux-f10698ed6807dc41d021fb7baeb24f9bc4051837.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/lib/api/fs')
| -rw-r--r-- | tools/lib/api/fs/debugfs.c | 2 | ||||
| -rw-r--r-- | tools/lib/api/fs/fs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/api/fs/debugfs.c b/tools/lib/api/fs/debugfs.c index a74fba6d7743..86ea2d7b8845 100644 --- a/tools/lib/api/fs/debugfs.c +++ b/tools/lib/api/fs/debugfs.c @@ -67,7 +67,7 @@ int debugfs_valid_mountpoint(const char *debugfs) if (statfs(debugfs, &st_fs) < 0) return -ENOENT; - else if (st_fs.f_type != (long) DEBUGFS_MAGIC) + else if ((long)st_fs.f_type != (long)DEBUGFS_MAGIC) return -ENOENT; return 0; diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c index 65d9be3f9887..128ef6332a6b 100644 --- a/tools/lib/api/fs/fs.c +++ b/tools/lib/api/fs/fs.c @@ -79,7 +79,7 @@ static int fs__valid_mount(const char *fs, long magic) if (statfs(fs, &st_fs) < 0) return -ENOENT; - else if (st_fs.f_type != magic) + else if ((long)st_fs.f_type != magic) return -ENOENT; return 0; |