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
/
nilfs2
/
inode.c
diff --git
a/fs/nilfs2/inode.c
b/fs/nilfs2/inode.c
index
af04f55
..
c7f4fef
100644
(file)
--- a/
fs/nilfs2/inode.c
+++ b/
fs/nilfs2/inode.c
@@
-367,7
+367,7
@@
struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
atomic64_inc(&root->inodes_count);
inode_init_owner(inode, dir, mode);
inode->i_ino = ino;
atomic64_inc(&root->inodes_count);
inode_init_owner(inode, dir, mode);
inode->i_ino = ino;
- inode->i_mtime = inode->i_atime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_mtime = inode->i_atime = inode->i_ctime =
current_time(inode)
;
if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) {
err = nilfs_bmap_read(ii->i_bmap, NULL);
if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) {
err = nilfs_bmap_read(ii->i_bmap, NULL);
@@
-749,7
+749,7
@@
void nilfs_truncate(struct inode *inode)
nilfs_truncate_bmap(ii, blkoff);
nilfs_truncate_bmap(ii, blkoff);
- inode->i_mtime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_mtime = inode->i_ctime =
current_time(inode)
;
if (IS_SYNC(inode))
nilfs_set_transaction_flag(NILFS_TI_SYNC);
if (IS_SYNC(inode))
nilfs_set_transaction_flag(NILFS_TI_SYNC);
@@
-829,7
+829,7
@@
int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
struct super_block *sb = inode->i_sb;
int err;
struct super_block *sb = inode->i_sb;
int err;
- err =
inode_change_ok(inode
, iattr);
+ err =
setattr_prepare(dentry
, iattr);
if (err)
return err;
if (err)
return err;