Merge git://www.linux-watchdog.org/linux-watchdog

[karo-tx-linux.git] / fs / cifs / file.c

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 42b99af74e0a99e1855e42a32d525f98331051cd..a95fe8b1afe93de6b091ce2015cd6f9dbb2f3f23 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1878,7 +1878,7 @@ static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)
                                           write_data, to - from, &offset);
                cifsFileInfo_put(open_file);
                /* Does mm or vfs already set times? */
-               inode->i_atime = inode->i_mtime = current_fs_time(inode->i_sb);
+               inode->i_atime = inode->i_mtime = current_time(inode);
                if ((bytes_written > 0) && (offset))
                        rc = 0;
                else if (bytes_written < 0)
@@ -3565,7 +3565,7 @@ static int cifs_readpage_worker(struct file *file, struct page *page,
                cifs_dbg(FYI, "Bytes read %d\n", rc);
 
        file_inode(file)->i_atime =
-               current_fs_time(file_inode(file)->i_sb);
+               current_time(file_inode(file));
 
        if (PAGE_SIZE > rc)
                memset(read_data + rc, 0, PAGE_SIZE - rc);