diff options
| author | Rob Herring <robh@kernel.org> | 2015-02-04 10:43:01 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-02-04 10:43:01 -0600 |
| commit | 962a70d05edac2e2eb53cd077715930083964b9e (patch) | |
| tree | f0b3a7bd574b2edfa76ce960e7f8630aea77e257 /tools/lib | |
| parent | 10638a4ed2b8618f20fabf9ed19df60a68446e90 (diff) | |
| parent | 26bc420b59a38e4e6685a73345a0def461136dce (diff) | |
Merge tag 'v3.19-rc6' into HEAD
Linux 3.19-rc6
Diffstat (limited to 'tools/lib')
| -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; |