7 files changed, 287 insertions, 20 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index a385d1c3f146..0214dd1e1060 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -208,21 +208,19 @@ EXPORT_SYMBOL_GPL(nfs_file_mmap);
  * fall back to doing a synchronous write.
  */
 static int
-nfs_file_fsync_commit(struct file *file, loff_t start, loff_t end, int datasync)
+nfs_file_fsync_commit(struct file *file, int datasync)
 {
         struct nfs_open_context *ctx = nfs_file_open_context(file);
         struct inode *inode = file_inode(file);
-        int have_error, do_resend, status;
+        int do_resend, status;
         int ret = 0;
 
         dprintk("NFS: fsync file(%pD2) datasync %d\n", file, datasync);
 
         nfs_inc_stats(inode, NFSIOS_VFSFSYNC);
         do_resend = test_and_clear_bit(NFS_CONTEXT_RESEND_WRITES, &ctx->flags);
-        have_error = test_and_clear_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
         status = nfs_commit_inode(inode, FLUSH_SYNC);
-        have_error |= test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
-        if (have_error) {
+        if (test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags)) {
                 ret = xchg(&ctx->error, 0);
                 if (ret)
                         goto out;
@@ -247,10 +245,16 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
         trace_nfs_fsync_enter(inode);
 
         do {
+                struct nfs_open_context *ctx = nfs_file_open_context(file);
                 ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+                if (test_and_clear_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags)) {
+                        int ret2 = xchg(&ctx->error, 0);
+                        if (ret2)
+                                ret = ret2;
+                }
                 if (ret != 0)
                         break;
-                ret = nfs_file_fsync_commit(file, start, end, datasync);
+                ret = nfs_file_fsync_commit(file, datasync);
                 if (!ret)
                         ret = pnfs_sync_inode(inode, !!datasync);
                 /*
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 68cc22083639..5bdf952f414b 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -768,3 +768,10 @@ static inline bool nfs_error_is_fatal(int err)
                 return false;
         }
 }
+
+static inline void nfs_context_set_write_error(struct nfs_open_context *ctx, int error)
+{
+        ctx->error = error;
+        smp_wmb();
+        set_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
+}
diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 2ca9167bc97d..551711042ba4 100644
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -719,6 +719,254 @@ TRACE_EVENT(nfs_sillyrename_unlink,
                         __get_str(name)
                 )
 );
+
+TRACE_EVENT(nfs_initiate_read,
+                TP_PROTO(
+                        const struct inode *inode,
+                        loff_t offset, unsigned long count
+                ),
+
+                TP_ARGS(inode, offset, count),
+
+                TP_STRUCT__entry(
+                        __field(loff_t, offset)
+                        __field(unsigned long, count)
+                        __field(dev_t, dev)
+                        __field(u32, fhandle)
+                        __field(u64, fileid)
+                ),
+
+                TP_fast_assign(
+                        const struct nfs_inode *nfsi = NFS_I(inode);
+
+                        __entry->offset = offset;
+                        __entry->count = count;
+                        __entry->dev = inode->i_sb->s_dev;
+                        __entry->fileid = nfsi->fileid;
+                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
+                ),
+
+                TP_printk(
+                        "fileid=%02x:%02x:%llu fhandle=0x%08x "
+                        "offset=%lld count=%lu",
+                        MAJOR(__entry->dev), MINOR(__entry->dev),
+                        (unsigned long long)__entry->fileid,
+                        __entry->fhandle,
+                        __entry->offset, __entry->count
+                )
+);
+
+TRACE_EVENT(nfs_readpage_done,
+                TP_PROTO(
+                        const struct inode *inode,
+                        int status, loff_t offset, bool eof
+                ),
+
+                TP_ARGS(inode, status, offset, eof),
+
+                TP_STRUCT__entry(
+                        __field(int, status)
+                        __field(loff_t, offset)
+                        __field(bool, eof)
+                        __field(dev_t, dev)
+                        __field(u32, fhandle)
+                        __field(u64, fileid)
+                ),
+
+                TP_fast_assign(
+                        const struct nfs_inode *nfsi = NFS_I(inode);
+
+                        __entry->status = status;
+                        __entry->offset = offset;
+                        __entry->eof = eof;
+                        __entry->dev = inode->i_sb->s_dev;
+                        __entry->fileid = nfsi->fileid;
+                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
+                ),
+
+                TP_printk(
+                        "fileid=%02x:%02x:%llu fhandle=0x%08x "
+                        "offset=%lld status=%d%s",
+                        MAJOR(__entry->dev), MINOR(__entry->dev),
+                        (unsigned long long)__entry->fileid,
+                        __entry->fhandle,
+                        __entry->offset, __entry->status,
+                        __entry->eof ? " eof" : ""
+                )
+);
+
+/*
+ * XXX: I tried using NFS_UNSTABLE and friends in this table, but they
+ * all evaluate to 0 for some reason, even if I include linux/nfs.h.
+ */
+#define nfs_show_stable(stable) \
+        __print_symbolic(stable, \
+                        { 0, " (UNSTABLE)" }, \
+                        { 1, " (DATA_SYNC)" }, \
+                        { 2, " (FILE_SYNC)" })
+
+TRACE_EVENT(nfs_initiate_write,
+                TP_PROTO(
+                        const struct inode *inode,
+                        loff_t offset, unsigned long count,
+                        enum nfs3_stable_how stable
+                ),
+
+                TP_ARGS(inode, offset, count, stable),
+
+                TP_STRUCT__entry(
+                        __field(loff_t, offset)
+                        __field(unsigned long, count)
+                        __field(enum nfs3_stable_how, stable)
+                        __field(dev_t, dev)
+                        __field(u32, fhandle)
+                        __field(u64, fileid)
+                ),
+
+                TP_fast_assign(
+                        const struct nfs_inode *nfsi = NFS_I(inode);
+
+                        __entry->offset = offset;
+                        __entry->count = count;
+                        __entry->stable = stable;
+                        __entry->dev = inode->i_sb->s_dev;
+                        __entry->fileid = nfsi->fileid;
+                        __entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
+                ),
+
+                TP_printk(
+                        "fileid=%02x:%02x:%llu fhandle=0x%08x "
+                        "offset=%lld count=%lu stable=%d%s",
+                        MAJOR(__entry->dev), MINOR(__entry->dev),
+                        (unsigned long long)__entry->fileid,
+                        __entry->fhandle,
+                        __entry->offset, __entry->count,
+                        __entry->stable, nfs_show_stable(__entry->stable)
+                )
+);
+
+TRACE_EVENT(nfs_writeback_done,
+                TP_PROTO(
+                        const struct inode *inode,
+                        int status,
+                        loff_t offset,
+                        struct nfs_writeverf *writeverf
+                ),
+
+                TP_ARGS(inode, status, offset, writeverf),
+
+                T