summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-09-13 01:54:48 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-09-13 01:54:48 +0400
commitbf2ba3bc185269eca274b458aac46ba1ad7c1121 (patch)
tree2cdaf7568df3ab762f42e7849fc9211dcb60d1bc /include/uapi
parentbcceeeba9b3ca99c29523bb7af16727f8a837db4 (diff)
parentf5e1dd34561e0fb06400b378d595198918833021 (diff)
downloadlinux-bf2ba3bc185269eca274b458aac46ba1ad7c1121.tar.xz
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/fs.h6
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 {
};
struct inodes_stat_t {
- int nr_inodes;
- int nr_unused;
- int dummy[5]; /* padding for sysctl ABI compatibility */
+ long nr_inodes;
+ long nr_unused;
+ long dummy[5]; /* padding for sysctl ABI compatibility */
};