diff --git a/[refs] b/[refs] index b322fb4bf356..3da39c3de8dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8d4f618fed5a4978afada52166bc2efaf7656d1 +refs/heads/master: 19c38b632d4554329986021fd66bdea468cf452c diff --git a/trunk/fs/sysfs/sysfs.h b/trunk/fs/sysfs/sysfs.h index 37e0e086233c..5a3192a08442 100644 --- a/trunk/fs/sysfs/sysfs.h +++ b/trunk/fs/sysfs/sysfs.h @@ -66,8 +66,8 @@ struct sysfs_dirent { }; unsigned int s_flags; + unsigned short s_mode; ino_t s_ino; - umode_t s_mode; struct sysfs_inode_attrs *s_iattr; };