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 'drm-armada-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm into...
[cascardo/linux.git]
/
fs
/
logfs
/
file.c
diff --git
a/fs/logfs/file.c
b/fs/logfs/file.c
index
f01ddfb
..
1db0493
100644
(file)
--- a/
fs/logfs/file.c
+++ b/
fs/logfs/file.c
@@
-211,7
+211,7
@@
long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
li->li_flags = flags;
inode_unlock(inode);
li->li_flags = flags;
inode_unlock(inode);
- inode->i_ctime =
CURRENT_TIME
;
+ inode->i_ctime =
current_time(inode)
;
mark_inode_dirty_sync(inode);
return 0;
mark_inode_dirty_sync(inode);
return 0;
@@
-244,7
+244,7
@@
static int logfs_setattr(struct dentry *dentry, struct iattr *attr)
struct inode *inode = d_inode(dentry);
int err = 0;
struct inode *inode = d_inode(dentry);
int err = 0;
- err =
inode_change_ok(inode
, attr);
+ err =
setattr_prepare(dentry
, attr);
if (err)
return err;
if (err)
return err;