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
/
reiserfs
/
inode.c
diff --git
a/fs/reiserfs/inode.c
b/fs/reiserfs/inode.c
index
c2c59f9
..
58b2ded
100644
(file)
--- a/
fs/reiserfs/inode.c
+++ b/
fs/reiserfs/inode.c
@@
-2005,7
+2005,7
@@
int reiserfs_new_inode(struct reiserfs_transaction_handle *th,
if (S_ISLNK(inode->i_mode))
inode->i_flags &= ~(S_IMMUTABLE | S_APPEND);
if (S_ISLNK(inode->i_mode))
inode->i_flags &= ~(S_IMMUTABLE | S_APPEND);
- inode->i_mtime = inode->i_atime = inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_mtime = inode->i_atime = inode->i_ctime =
current_time(inode)
;
inode->i_size = i_size;
inode->i_blocks = 0;
inode->i_bytes = 0;
inode->i_size = i_size;
inode->i_blocks = 0;
inode->i_bytes = 0;
@@
-3312,7
+3312,7
@@
int reiserfs_setattr(struct dentry *dentry, struct iattr *attr)
unsigned int ia_valid;
int error;
unsigned int ia_valid;
int error;
- error =
inode_change_ok(inode
, attr);
+ error =
setattr_prepare(dentry
, attr);
if (error)
return error;
if (error)
return error;