projects
/
linux-2.6-microblaze.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-microblaze.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
8cc218d
..
ce93b41
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-1569,7
+1569,7
@@
void lease_get_mtime(struct inode *inode, struct timespec *time)
}
if (has_lease)
- *time = current_
fs_time(inode->i_sb
);
+ *time = current_
time(inode
);
else
*time = inode->i_mtime;
}