diff options
| -rw-r--r-- | fs/inode.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/inode.c b/fs/inode.c index ada7643104e1..bf6bec4e54ff 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -657,7 +657,7 @@ static struct inode * get_new_inode_fast(struct super_block *sb, struct hlist_he | |||
| 657 | return inode; | 657 | return inode; |
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | static inline unsigned long hash(struct super_block *sb, unsigned long hashval) | 660 | static unsigned long hash(struct super_block *sb, unsigned long hashval) |
| 661 | { | 661 | { |
| 662 | unsigned long tmp; | 662 | unsigned long tmp; |
| 663 | 663 | ||
| @@ -1003,7 +1003,7 @@ void generic_delete_inode(struct inode *inode) | |||
| 1003 | 1003 | ||
| 1004 | list_del_init(&inode->i_list); | 1004 | list_del_init(&inode->i_list); |
| 1005 | list_del_init(&inode->i_sb_list); | 1005 | list_del_init(&inode->i_sb_list); |
| 1006 | inode->i_state|=I_FREEING; | 1006 | inode->i_state |= I_FREEING; |
| 1007 | inodes_stat.nr_inodes--; | 1007 | inodes_stat.nr_inodes--; |
| 1008 | spin_unlock(&inode_lock); | 1008 | spin_unlock(&inode_lock); |
| 1009 | 1009 | ||
| @@ -1210,13 +1210,15 @@ void file_update_time(struct file *file) | |||
| 1210 | return; | 1210 | return; |
| 1211 | 1211 | ||
| 1212 | now = current_fs_time(inode->i_sb); | 1212 | now = current_fs_time(inode->i_sb); |
| 1213 | if (!timespec_equal(&inode->i_mtime, &now)) | 1213 | if (!timespec_equal(&inode->i_mtime, &now)) { |
| 1214 | inode->i_mtime = now; | ||
| 1214 | sync_it = 1; | 1215 | sync_it = 1; |
| 1215 | inode->i_mtime = now; | 1216 | } |
| 1216 | 1217 | ||
| 1217 | if (!timespec_equal(&inode->i_ctime, &now)) | 1218 | if (!timespec_equal(&inode->i_ctime, &now)) { |
| 1219 | inode->i_ctime = now; | ||
| 1218 | sync_it = 1; | 1220 | sync_it = 1; |
| 1219 | inode->i_ctime = now; | 1221 | } |
| 1220 | 1222 | ||
| 1221 | if (sync_it) | 1223 | if (sync_it) |
| 1222 | mark_inode_dirty_sync(inode); | 1224 | mark_inode_dirty_sync(inode); |
