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
/
ufs
/
inode.c
diff --git
a/fs/ufs/inode.c
b/fs/ufs/inode.c
index
9f49431
..
190d64b
100644
(file)
--- a/
fs/ufs/inode.c
+++ b/
fs/ufs/inode.c
@@
-293,7
+293,7
@@
ufs_inode_getfrag(struct inode *inode, unsigned index,
if (new)
*new = 1;
if (new)
*new = 1;
- inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_ctime =
current_time(inode)
;
if (IS_SYNC(inode))
ufs_sync_inode (inode);
mark_inode_dirty(inode);
if (IS_SYNC(inode))
ufs_sync_inode (inode);
mark_inode_dirty(inode);
@@
-375,7
+375,7
@@
ufs_inode_getblock(struct inode *inode, u64 ind_block,
mark_buffer_dirty(bh);
if (IS_SYNC(inode))
sync_dirty_buffer(bh);
mark_buffer_dirty(bh);
if (IS_SYNC(inode))
sync_dirty_buffer(bh);
- inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_ctime =
current_time(inode)
;
mark_inode_dirty(inode);
out:
brelse (bh);
mark_inode_dirty(inode);
out:
brelse (bh);
@@
-1185,7
+1185,7
@@
static int ufs_truncate(struct inode *inode, loff_t size)
truncate_setsize(inode, size);
__ufs_truncate_blocks(inode);
truncate_setsize(inode, size);
__ufs_truncate_blocks(inode);
- inode->i_mtime = inode->i_ctime =
CURRENT_TIME_SEC
;
+ inode->i_mtime = inode->i_ctime =
current_time(inode)
;
mark_inode_dirty(inode);
out:
UFSD("EXIT: err %d\n", err);
mark_inode_dirty(inode);
out:
UFSD("EXIT: err %d\n", err);
@@
-1208,7
+1208,7
@@
int ufs_setattr(struct dentry *dentry, struct iattr *attr)
unsigned int ia_valid = attr->ia_valid;
int error;
unsigned int ia_valid = attr->ia_valid;
int error;
- error =
inode_change_ok(inode
, attr);
+ error =
setattr_prepare(dentry
, attr);
if (error)
return error;
if (error)
return error;