diff --git a/[refs] b/[refs] index b794dd4b5241..b065da9a3144 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ffbb9162312fd8113037cb3d94f787f06bbfa9a +refs/heads/master: 7762f5a0b709b415fda132258ad37b9f2a1db994 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 34406ed467c3..661c7c572149 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -656,7 +656,11 @@ static inline loff_t i_size_read(struct inode *inode) #endif } - +/* + * NOTE: unlike i_size_read(), i_size_write() does need locking around it + * (normally i_mutex), otherwise on 32bit/SMP an update of i_size_seqcount + * can be lost, resulting in subsequent i_size_read() calls spinning forever. + */ static inline void i_size_write(struct inode *inode, loff_t i_size) { #if BITS_PER_LONG==32 && defined(CONFIG_SMP)