Patched in Tegra support.

1 files changed, 106 insertions, 53 deletions

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 1cc25682b20..fc0fd15c28d 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -5,18 +5,38 @@
  *
  *  OS-specific nfs filesystem definitions and declarations
  */
+
 #ifndef _LINUX_NFS_FS_H
 #define _LINUX_NFS_FS_H
 
-#include <uapi/linux/nfs_fs.h>
+#include <linux/magic.h>
+
+/* Default timeout values */
+#define NFS_DEF_UDP_TIMEO       (11)
+#define NFS_DEF_UDP_RETRANS     (3)
+#define NFS_DEF_TCP_TIMEO       (600)
+#define NFS_DEF_TCP_RETRANS     (2)
+
+#define NFS_MAX_UDP_TIMEOUT     (60*HZ)
+#define NFS_MAX_TCP_TIMEOUT     (600*HZ)
 
+#define NFS_DEF_ACREGMIN        (3)
+#define NFS_DEF_ACREGMAX        (60)
+#define NFS_DEF_ACDIRMIN        (30)
+#define NFS_DEF_ACDIRMAX        (60)
 
 /*
- * Enable dprintk() debugging support for nfs client.
+ * When flushing a cluster of dirty pages, there can be different
+ * strategies:
  */
-#ifdef CONFIG_NFS_DEBUG
-# define NFS_DEBUG
-#endif
+#define FLUSH_SYNC              1       /* file being synced, or contention */
+#define FLUSH_STABLE            4       /* commit to stable storage */
+#define FLUSH_LOWPRI            8       /* low priority background flush */
+#define FLUSH_HIGHPRI           16      /* high priority memory reclaim flush */
+#define FLUSH_COND_STABLE       32      /* conditional stable write - only stable
+                                         * if everything fits in one RPC */
+
+#ifdef __KERNEL__
 
 #include <linux/in.h>
 #include <linux/mm.h>
@@ -54,16 +74,12 @@ struct nfs_access_entry {
         int                     mask;
 };
 
-struct nfs_lockowner {
-        fl_owner_t l_owner;
-        pid_t l_pid;
-};
-
 struct nfs_lock_context {
         atomic_t count;
         struct list_head list;
         struct nfs_open_context *open_context;
-        struct nfs_lockowner lockowner;
+        fl_owner_t lockowner;
+        pid_t pid;
 };
 
 struct nfs4_state;
@@ -76,11 +92,9 @@ struct nfs_open_context {
 
         unsigned long flags;
 #define NFS_CONTEXT_ERROR_WRITE         (0)
-#define NFS_CONTEXT_RESEND_WRITES       (1)
         int error;
 
         struct list_head list;
-        struct nfs4_threshold   *mdsthreshold;
 };
 
 struct nfs_open_dir_context {
@@ -135,6 +149,7 @@ struct nfs_inode {
         unsigned long           read_cache_jiffies;
         unsigned long           attrtimeo;
         unsigned long           attrtimeo_timestamp;
+        __u64                   change_attr;            /* v4 only */
 
         unsigned long           attr_gencount;
         /* "Generation counter" for the attribute cache. This is
@@ -157,8 +172,13 @@ struct nfs_inode {
          */
         __be32                  cookieverf[2];
 
+        /*
+         * This is the list of dirty unwritten pages.
+         */
+        struct radix_tree_root  nfs_page_tree;
+
         unsigned long           npages;
-        struct nfs_mds_commit_info commit_info;
+        unsigned long           ncommit;
 
         /* Open contexts for shared mmap writes */
         struct list_head        open_files;
@@ -169,7 +189,7 @@ struct nfs_inode {
         struct hlist_head       silly_list;
         wait_queue_head_t       waitqueue;
 
-#if IS_ENABLED(CONFIG_NFS_V4)
+#ifdef CONFIG_NFS_V4
         struct nfs4_cached_acl  *nfs4_acl;
         /* NFSv4 state */
         struct list_head        open_states;
@@ -179,10 +199,8 @@ struct nfs_inode {
 
         /* pNFS layout information */
         struct pnfs_layout_hdr *layout;
+        atomic_t                commits_outstanding;
 #endif /* CONFIG_NFS_V4*/
-        /* how many bytes have been written/read and how many bytes queued up */
-        __u64 write_io;
-        __u64 read_io;
 #ifdef CONFIG_NFS_FSCACHE
         struct fscache_cookie   *fscache;
 #endif
@@ -210,8 +228,8 @@ struct nfs_inode {
 #define NFS_INO_FSCACHE         (5)             /* inode can be cached by FS-Cache */
 #define NFS_INO_FSCACHE_LOCK    (6)             /* FS-Cache cookie management lock */
 #define NFS_INO_COMMIT          (7)             /* inode is committing unstable writes */
+#define NFS_INO_PNFS_COMMIT     (8)             /* use pnfs code for commit */
 #define NFS_INO_LAYOUTCOMMIT    (9)             /* layoutcommit required */
-#define NFS_INO_LAYOUTCOMMITTING (10)           /* layoutcommit inflight */
 
 static inline struct nfs_inode *NFS_I(const struct inode *inode)
 {
@@ -243,6 +261,11 @@ static inline const struct nfs_rpc_ops *NFS_PROTO(const struct inode *inode)
         return NFS_SERVER(inode)->nfs_client->rpc_ops;
 }
 
+static inline __be32 *NFS_COOKIEVERF(const struct inode *inode)
+{
+        return NFS_I(inode)->cookieverf;
+}
+
 static inline unsigned NFS_MINATTRTIMEO(const struct inode *inode)
 {
         struct nfs_server *nfss = NFS_SERVER(inode);
@@ -291,6 +314,11 @@ static inline int nfs_server_capable(struct inode *inode, int cap)
         return NFS_SERVER(inode)->caps & cap;
 }
 
+static inline int NFS_USE_READDIRPLUS(struct inode *inode)
+{
+        return test_bit(NFS_INO_ADVISE_RDPLUS, &NFS_I(inode)->flags);
+}
+
 static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
 {
         dentry->d_time = verf;
@@ -333,8 +361,6 @@ extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);
 extern int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_post_op_update_inode_force_wcc(struct inode *inode, struct nfs_fattr *fattr);
 extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
-extern void nfs_access_add_cache(struct inode *, struct nfs_access_entry *);
-extern void nfs_access_set_mask(struct nfs_access_entry *, u32);
 extern int nfs_permission(struct inode *, int);
 extern int nfs_open(struct inode *, struct file *);
 extern int nfs_release(struct inode *, struct file *);
@@ -347,7 +373,7 @@ extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr);
 extern struct nfs_open_context *get_nfs_open_context(struct nfs_open_context *ctx);
 extern void put_nfs_open_context(struct nfs_open_context *ctx);
 extern struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_cred *cred, fmode_t mode);
-extern struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, fmode_t f_mode);
+extern struct nfs_open_context *alloc_nfs_open_context(struct dentry *dentry, struct rpc_cred *cred, fmode_t f_mode);
 extern void nfs_file_set_open_context(struct file *filp, struct nfs_open_context *ctx);
 extern struct nfs_lock_context *nfs_get_lock_context(struct nfs_open_context *ctx);
 extern void nfs_put_lock_context(struct nfs_lock_context *l_ctx);
@@ -369,29 +395,6 @@ static inline void nfs_free_fhandle(const struct nfs_fh *fh)
         kfree(fh);
 }
 
-#ifdef NFS_DEBUG
-extern u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh);
-static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
-{
-        return _nfs_display_fhandle_hash(fh);
-}
-extern void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption);
-#define nfs_display_fhandle(fh, caption)                        \
-        do {                                                    \
-                if (unlikely(nfs_debug & NFSDBG_FACILITY))      \
-                        _nfs_display_fhandle(fh, caption);      \
-        } while (0)
-#else
-static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
-{
-        return 0;
-}
-static inline void nfs_display_fhandle(const struct nfs_fh *fh,
-                                       const char *caption)
-{
-}
-#endif
-
 /*
  * linux/fs/nfs/nfsroot.c
  */
@@ -402,8 +405,12 @@ extern __be32 root_nfs_parse_addr(char *name); /*__init*/
 /*
  * linux/fs/nfs/file.c
  */
+extern const struct inode_operations nfs_file_inode_operations;
+#ifdef CONFIG_NFS_V3
+extern const struct inode_operations nfs3_file_inode_operations;
+#endif /* CONFIG_NFS_V3 */
 extern const struct file_operations nfs_file_operations;
-#if IS_ENABLED(CONFIG_NFS_V4)
+#ifdef CONFIG_NFS_V4
 extern const struct file_operations nfs4_file_operations;
 #endif /* CONFIG_NFS_V4 */
 extern const struct address_space_operations nfs_file_aops;
@@ -448,14 +455,18 @@ extern ssize_t nfs_direct_IO(int, struct kiocb *, const struct iovec *, loff_t,
                         unsigned long);
 extern ssize_t nfs_file_direct_read(struct kiocb *iocb,
                         const struct iovec *iov, unsigned long nr_segs,
-                        loff_t pos, bool uio);
+                        loff_t pos);
 extern ssize_t nfs_file_direct_write(struct kiocb *iocb,
                         const struct iovec *iov, unsigned long nr_segs,
-                        loff_t pos, bool uio);
+                        loff_t pos);
 
 /*
  * linux/fs/nfs/dir.c
  */
+extern const struct inode_operations nfs_dir_inode_operations;
+#ifdef CONFIG_NFS_V3
+extern const struct inode_operations nfs3_dir_inode_operations;
+#endif /* CONFIG_NFS_V3 */
 extern const struct file_operations nfs_dir_operations;
 extern const struct dentry_operations nfs_dentry_operations;
 
@@ -513,10 +524,10 @@ extern void nfs_writeback_done(struct rpc_task *, struct nfs_write_data *);
 extern int nfs_wb_all(struct inode *inode);
 extern int nfs_wb_page(struct inode *inode, struct page* page);
 extern int nfs_wb_page_cancel(struct inode *inode, struct page* page);
-#if IS_ENABLED(CONFIG_NFS_V3) || IS_ENABLED(CONFIG_NFS_V4)
+#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
 extern int  nfs_commit_inode(struct inode *, int);
-extern struct nfs_commit_data *nfs_commitdata_alloc(void);
-extern void nfs_commit_free(struct nfs_commit_data *data);
+extern struct nfs_write_data *nfs_commitdata_alloc(void);
+extern void nfs_commit_free(struct nfs_write_data *wdata);
 #else
 static inline int
 nfs_commit_inode(struct inode *inode, int how)
@@ -532,6 +543,12 @@ nfs_have_writebacks(struct inode *inode)
 }
 
 /*
+ * Allocate nfs_write_data structures
+ */
+extern struct nfs_write_data *nfs_writedata_alloc(unsigned int npages);
+extern void nfs_writedata_free(struct nfs_write_data *);
+
+/*
  * linux/fs/nfs/read.c
  */
 extern int  nfs_readpage(struct file *, struct page *);
@@ -542,6 +559,12 @@ extern int  nfs_readpage_async(struct nfs_open_context *, struct inode *,
                                struct page *);
 
 /*
+ * Allocate nfs_read_data structures
+ */
+extern struct nfs_read_data *nfs_readdata_alloc(unsigned int npages);
+extern void nfs_readdata_free(struct nfs_read_data *);
+
+/*
  * linux/fs/nfs3proc.c
  */
 #ifdef CONFIG_NFS_V3_ACL
@@ -586,13 +609,43 @@ nfs_fileid_to_ino_t(u64 fileid)
 
 #define NFS_JUKEBOX_RETRY_TIME (5 * HZ)
 
+#endif /* __KERNEL__ */
+
+/*
+ * NFS debug flags
+ */
+#define NFSDBG_VFS              0x0001
+#define NFSDBG_DIRCACHE         0x0002
+#define NFSDBG_LOOKUPCACHE      0x0004
+#define NFSDBG_PAGECACHE        0x0008
+#define NFSDBG_PROC             0x0010
+#define NFSDBG_XDR              0x0020
+#define NFSDBG_FILE             0x0040
+#define NFSDBG_ROOT             0x0080
+#define NFSDBG_CALLBACK         0x0100
+#define NFSDBG_CLIENT           0x0200
+#define NFSDBG_MOUNT            0x0400
+#define NFSDBG_FSCACHE          0x0800
+#define NFSDBG_PNFS             0x1000
+#define NFSDBG_PNFS_LD          0x2000
+#define NFSDBG_ALL              0xFFFF
+
+#ifdef __KERNEL__
+
+/*
+ * Enable debugging support for nfs client.
+ * Requires RPC_DEBUG.
+ */
+#ifdef RPC_DEBUG
+# define NFS_DEBUG
+#endif
 
 # undef ifdebug
 # ifdef NFS_DEBUG
 #  define ifdebug(fac)          if (unlikely(nfs_debug & NFSDBG_##fac))
-#  define NFS_IFDEBUG(x)        x
 # else
 #  define ifdebug(fac)          if (0)
-#  define NFS_IFDEBUG(x)
 # endif
+#endif /* __KERNEL */
+
 #endif