projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
autofs4
/
root.c
diff --git
a/fs/autofs4/root.c
b/fs/autofs4/root.c
index
fa84bb8
..
623510e
100644
(file)
--- a/
fs/autofs4/root.c
+++ b/
fs/autofs4/root.c
@@
-591,7
+591,7
@@
static int autofs4_dir_symlink(struct inode *dir,
if (p_ino && !IS_ROOT(dentry))
atomic_inc(&p_ino->count);
if (p_ino && !IS_ROOT(dentry))
atomic_inc(&p_ino->count);
- dir->i_mtime =
CURRENT_TIME
;
+ dir->i_mtime =
current_time(dir)
;
return 0;
}
return 0;
}
@@
-631,7
+631,7
@@
static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
d_inode(dentry)->i_size = 0;
clear_nlink(d_inode(dentry));
d_inode(dentry)->i_size = 0;
clear_nlink(d_inode(dentry));
- dir->i_mtime =
CURRENT_TIME
;
+ dir->i_mtime =
current_time(dir)
;
spin_lock(&sbi->lookup_lock);
__autofs4_add_expiring(dentry);
spin_lock(&sbi->lookup_lock);
__autofs4_add_expiring(dentry);
@@
-762,7
+762,7
@@
static int autofs4_dir_mkdir(struct inode *dir,
if (p_ino && !IS_ROOT(dentry))
atomic_inc(&p_ino->count);
inc_nlink(dir);
if (p_ino && !IS_ROOT(dentry))
atomic_inc(&p_ino->count);
inc_nlink(dir);
- dir->i_mtime =
CURRENT_TIME
;
+ dir->i_mtime =
current_time(dir)
;
return 0;
}
return 0;
}