Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[linux-2.6-microblaze.git] / fs / nfs / read.c

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 34bb9ad..eb854f1 100644 (file)
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -250,7 +250,7 @@ static int nfs_readpage_done(struct rpc_task *task,
        trace_nfs_readpage_done(task, hdr);
 
        if (task->tk_status == -ESTALE) {
-               set_bit(NFS_INO_STALE, &NFS_I(inode)->flags);
+               nfs_set_inode_stale(inode);
                nfs_mark_for_revalidate(inode);
        }
        return 0;
@@ -264,6 +264,8 @@ static void nfs_readpage_retry(struct rpc_task *task,
 
        /* This is a short read! */
        nfs_inc_stats(hdr->inode, NFSIOS_SHORTREAD);
+       trace_nfs_readpage_short(task, hdr);
+
        /* Has the server at least made some progress? */
        if (resp->count == 0) {
                nfs_set_pgio_error(hdr, -EIO, argp->offset);