Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 21b4dfa..d6ff4be 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1554,9 +1554,9 @@ out:
 EXPORT_SYMBOL(__break_lease);
 
 /**
- *     lease_get_mtime - get the last modified time of an inode
+ *     lease_get_mtime - update modified time of an inode with exclusive lease
  *     @inode: the inode
- *      @time:  pointer to a timespec which will contain the last modified time
+ *      @time:  pointer to a timespec which contains the last modified time
  *
  * This is to force NFS clients to flush their caches for files with
  * exclusive leases.  The justification is that if someone has an
@@ -1580,8 +1580,6 @@ void lease_get_mtime(struct inode *inode, struct timespec *time)
 
        if (has_lease)
                *time = current_time(inode);
-       else
-               *time = inode->i_mtime;
 }
 
 EXPORT_SYMBOL(lease_get_mtime);