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 '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
[cascardo/linux.git]
/
fs
/
nsfs.c
diff --git
a/fs/nsfs.c
b/fs/nsfs.c
index
30bb100
..
8718af8
100644
(file)
--- a/
fs/nsfs.c
+++ b/
fs/nsfs.c
@@
-78,7
+78,7
@@
slow:
return ERR_PTR(-ENOMEM);
}
inode->i_ino = ns->inum;
return ERR_PTR(-ENOMEM);
}
inode->i_ino = ns->inum;
- 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_flags |= S_IMMUTABLE;
inode->i_mode = S_IFREG | S_IRUGO;
inode->i_fop = &ns_file_operations;
inode->i_flags |= S_IMMUTABLE;
inode->i_mode = S_IFREG | S_IRUGO;
inode->i_fop = &ns_file_operations;