Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[firefly-linux-kernel-4.4.55.git] / include / linux / nfs_fs.h

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index cf395351cdd43069a2f631160211a68315558cf3..c098ae194f79daf0c498a7aec7e3eb24186d24c5 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -184,6 +184,7 @@ struct nfs_inode {
 #define NFS_INO_INVALID_ACCESS 0x0008          /* cached access cred invalid */
 #define NFS_INO_INVALID_ACL    0x0010          /* cached acls are invalid */
 #define NFS_INO_REVAL_PAGECACHE        0x0020          /* must revalidate pagecache */
+#define NFS_INO_REVAL_FORCED   0x0040          /* force revalidation ignoring a delegation */
 
 /*
  * Bit offsets in flags field
@@ -493,21 +494,18 @@ static inline void nfs3_forget_cached_acls(struct inode *inode)
 
 /*
  * linux/fs/mount_clnt.c
- * (Used only by nfsroot module)
  */
-extern int  nfsroot_mount(struct sockaddr_in *, char *, struct nfs_fh *,
-               int, int);
+extern int  nfs_mount(struct sockaddr *, size_t, char *, char *,
+                     int, int, struct nfs_fh *);
 
 /*
  * inline functions
  */
 
-static inline loff_t
-nfs_size_to_loff_t(__u64 size)
+static inline loff_t nfs_size_to_loff_t(__u64 size)
 {
-       loff_t maxsz = (((loff_t) ULONG_MAX) << PAGE_CACHE_SHIFT) + PAGE_CACHE_SIZE - 1;
-       if (size > maxsz)
-               return maxsz;
+       if (size > (__u64) OFFSET_MAX - 1)
+               return OFFSET_MAX - 1;
        return (loff_t) size;
 }
 
@@ -554,6 +552,7 @@ extern void * nfs_root_data(void);
 #define NFSDBG_ROOT            0x0080
 #define NFSDBG_CALLBACK                0x0100
 #define NFSDBG_CLIENT          0x0200
+#define NFSDBG_MOUNT           0x0400
 #define NFSDBG_ALL             0xFFFF
 
 #ifdef __KERNEL__