Merge tag 'nfs-for-5.2-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[linux-2.6-block.git] / fs / nfs / internal.h

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 331a0504eaf8407e82e38655cc2324fa470de80f..498fab72f70bc8b4d3033126bbe1eaa2635e6db1 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -84,6 +84,7 @@ struct nfs_client_initdata {
        u32 minorversion;
        struct net *net;
        const struct rpc_timeout *timeparms;
+       const struct cred *cred;
 };
 
 /*
@@ -766,15 +767,10 @@ static inline bool nfs_error_is_fatal(int err)
        case -ESTALE:
        case -E2BIG:
        case -ENOMEM:
+       case -ETIMEDOUT:
                return true;
        default:
                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);
-}