projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'ovl/rename2' into for-linus
[cascardo/linux.git]
/
fs
/
f2fs
/
namei.c
diff --git
a/fs/f2fs/namei.c
b/fs/f2fs/namei.c
index
73fa356
..
71e36a7
100644
(file)
--- a/
fs/f2fs/namei.c
+++ b/
fs/f2fs/namei.c
@@
-46,7
+46,7
@@
static struct inode *f2fs_new_inode(struct inode *dir, umode_t mode)
inode->i_ino = ino;
inode->i_blocks = 0;
inode->i_ino = ino;
inode->i_blocks = 0;
- inode->i_mtime = inode->i_atime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_mtime = inode->i_atime = inode->i_ctime =
current_time(inode)
;
inode->i_generation = sbi->s_next_generation++;
err = insert_inode_locked(inode);
inode->i_generation = sbi->s_next_generation++;
err = insert_inode_locked(inode);
@@
-177,7
+177,7
@@
static int f2fs_link(struct dentry *old_dentry, struct inode *dir,
f2fs_balance_fs(sbi, true);
f2fs_balance_fs(sbi, true);
- inode->i_ctime =
CURRENT_TIME
;
+ inode->i_ctime =
current_time(inode)
;
ihold(inode);
set_inode_flag(inode, FI_INC_LINK);
ihold(inode);
set_inode_flag(inode, FI_INC_LINK);
@@
-718,7
+718,7
@@
static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
f2fs_set_link(new_dir, new_entry, new_page, old_inode);
f2fs_set_link(new_dir, new_entry, new_page, old_inode);
- new_inode->i_ctime =
CURRENT_TIME
;
+ new_inode->i_ctime =
current_time(new_inode)
;
down_write(&F2FS_I(new_inode)->i_sem);
if (old_dir_entry)
f2fs_i_links_write(new_inode, false);
down_write(&F2FS_I(new_inode)->i_sem);
if (old_dir_entry)
f2fs_i_links_write(new_inode, false);
@@
-772,7
+772,7
@@
static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
file_set_enc_name(old_inode);
up_write(&F2FS_I(old_inode)->i_sem);
file_set_enc_name(old_inode);
up_write(&F2FS_I(old_inode)->i_sem);
- old_inode->i_ctime =
CURRENT_TIME
;
+ old_inode->i_ctime =
current_time(old_inode)
;
f2fs_mark_inode_dirty_sync(old_inode);
f2fs_delete_entry(old_entry, old_page, old_dir, NULL);
f2fs_mark_inode_dirty_sync(old_inode);
f2fs_delete_entry(old_entry, old_page, old_dir, NULL);
@@
-927,7
+927,7
@@
static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
file_lost_pino(old_inode);
up_write(&F2FS_I(old_inode)->i_sem);
file_lost_pino(old_inode);
up_write(&F2FS_I(old_inode)->i_sem);
- old_dir->i_ctime =
CURRENT_TIME
;
+ old_dir->i_ctime =
current_time(old_dir)
;
if (old_nlink) {
down_write(&F2FS_I(old_dir)->i_sem);
f2fs_i_links_write(old_dir, old_nlink > 0);
if (old_nlink) {
down_write(&F2FS_I(old_dir)->i_sem);
f2fs_i_links_write(old_dir, old_nlink > 0);
@@
-942,7
+942,7
@@
static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
file_lost_pino(new_inode);
up_write(&F2FS_I(new_inode)->i_sem);
file_lost_pino(new_inode);
up_write(&F2FS_I(new_inode)->i_sem);
- new_dir->i_ctime =
CURRENT_TIME
;
+ new_dir->i_ctime =
current_time(new_dir)
;
if (new_nlink) {
down_write(&F2FS_I(new_dir)->i_sem);
f2fs_i_links_write(new_dir, new_nlink > 0);
if (new_nlink) {
down_write(&F2FS_I(new_dir)->i_sem);
f2fs_i_links_write(new_dir, new_nlink > 0);
@@
-1093,7
+1093,7
@@
const struct inode_operations f2fs_dir_inode_operations = {
.mkdir = f2fs_mkdir,
.rmdir = f2fs_rmdir,
.mknod = f2fs_mknod,
.mkdir = f2fs_mkdir,
.rmdir = f2fs_rmdir,
.mknod = f2fs_mknod,
- .rename
2
= f2fs_rename2,
+ .rename
= f2fs_rename2,
.tmpfile = f2fs_tmpfile,
.getattr = f2fs_getattr,
.setattr = f2fs_setattr,
.tmpfile = f2fs_tmpfile,
.getattr = f2fs_getattr,
.setattr = f2fs_setattr,