projects
/
linux-2.6-block.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
[linux-2.6-block.git]
/
fs
/
attr.c
diff --git
a/fs/attr.c
b/fs/attr.c
index a19a64d41e7e63433e7bf99ef4e7c1bf305d5fac..c902b3d53508004203e00abb3ae051280d485423 100644
(file)
--- a/
fs/attr.c
+++ b/
fs/attr.c
@@
-237,7
+237,7
@@
int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **de
inode->i_flags &= ~S_NOSEC;
}
- now = current_
fs_time(inode->i_sb
);
+ now = current_
time(inode
);
attr->ia_ctime = now;
if (!(ia_valid & ATTR_ATIME_SET))