diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-12 17:54:48 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-12 17:54:48 -0400 |
| commit | bf2ba3bc185269eca274b458aac46ba1ad7c1121 (patch) | |
| tree | 2cdaf7568df3ab762f42e7849fc9211dcb60d1bc /include/uapi/linux | |
| parent | bcceeeba9b3ca99c29523bb7af16727f8a837db4 (diff) | |
| parent | f5e1dd34561e0fb06400b378d595198918833021 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/fs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index a4ed56cf0eac..6c28b61bb690 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h | |||
| @@ -49,9 +49,9 @@ struct files_stat_struct { | |||
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | struct inodes_stat_t { | 51 | struct inodes_stat_t { |
| 52 | int nr_inodes; | 52 | long nr_inodes; |
| 53 | int nr_unused; | 53 | long nr_unused; |
| 54 | int dummy[5]; /* padding for sysctl ABI compatibility */ | 54 | long dummy[5]; /* padding for sysctl ABI compatibility */ |
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | 57 | ||
