diff --git a/[refs] b/[refs] index bec725ebc49b..5062206cf6da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fd5746fd3d7838bf6ff991d50f1257057d1156f +refs/heads/master: 28ad0c118b0ed98b042d362acfe0017591921138 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index bcd63706db87..d883aa1fc2eb 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -729,8 +729,8 @@ struct inode { struct timespec i_atime; struct timespec i_mtime; struct timespec i_ctime; - unsigned int i_blkbits; blkcnt_t i_blocks; + unsigned int i_blkbits; unsigned short i_bytes; umode_t i_mode; spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */