nfsd: merge cookie collision fixes from ext4 tree

These changes fix readdir loops on ext4 filesystems with dir_index
turned on.  I'm pulling them from Ted's tree as I'd like to give them
some extra nfsd testing, and expect to be applying (potentially
conflicting) patches to the same code before the next merge window.

From the nfs-ext4-premerge branch of

	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

2 files changed, 25 insertions, 10 deletions

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index edf6d3ed8777..7423d712eb8c 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -737,12 +737,13 @@ static int nfsd_open_break_lease(struct inode *inode, int access)
 
 /*
  * Open an existing file or directory.
- * The access argument indicates the type of open (read/write/lock)
+ * The may_flags argument indicates the type of open (read/write/lock)
+ * and additional flags.
  * N.B. After this call fhp needs an fh_put
  */
 __be32
 nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
-                        int access, struct file **filp)
+                        int may_flags, struct file **filp)
 {
         struct dentry   *dentry;
         struct inode    *inode;
@@ -757,7 +758,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
          * and (hopefully) checked permission - so allow OWNER_OVERRIDE
          * in case a chmod has now revoked permission.
          */
-        err = fh_verify(rqstp, fhp, type, access | NFSD_MAY_OWNER_OVERRIDE);
+        err = fh_verify(rqstp, fhp, type, may_flags | NFSD_MAY_OWNER_OVERRIDE);
         if (err)
                 goto out;
 
@@ -768,7 +769,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
          * or any access when mandatory locking enabled
          */
         err = nfserr_perm;
-        if (IS_APPEND(inode) && (access & NFSD_MAY_WRITE))
+        if (IS_APPEND(inode) && (may_flags & NFSD_MAY_WRITE))
                 goto out;
         /*
          * We must ignore files (but only files) which might have mandatory
@@ -781,12 +782,12 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
         if (!inode->i_fop)
                 goto out;
 
-        host_err = nfsd_open_break_lease(inode, access);
+        host_err = nfsd_open_break_lease(inode, may_flags);
         if (host_err) /* NOMEM or WOULDBLOCK */
                 goto out_nfserr;
 
-        if (access & NFSD_MAY_WRITE) {
-                if (access & NFSD_MAY_READ)
+        if (may_flags & NFSD_MAY_WRITE) {
+                if (may_flags & NFSD_MAY_READ)
                         flags = O_RDWR|O_LARGEFILE;
                 else
                         flags = O_WRONLY|O_LARGEFILE;
@@ -795,8 +796,15 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,
                             flags, current_cred());
         if (IS_ERR(*filp))
                 host_err = PTR_ERR(*filp);
-        else
-                host_err = ima_file_check(*filp, access);
+        else {
+                host_err = ima_file_check(*filp, may_flags);
+
+                if (may_flags & NFSD_MAY_64BIT_COOKIE)
+                        (*filp)->f_mode |= FMODE_64BITHASH;
+                else
+                        (*filp)->f_mode |= FMODE_32BITHASH;
+        }
+
 out_nfserr:
         err = nfserrno(host_err);
 out:
@@ -2020,8 +2028,13 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t *offsetp,
         __be32          err;
         struct file     *file;
         loff_t          offset = *offsetp;
+        int             may_flags = NFSD_MAY_READ;
+
+        /* NFSv2 only supports 32 bit cookies */
+        if (rqstp->rq_vers > 2)
+                may_flags |= NFSD_MAY_64BIT_COOKIE;
 
-        err = nfsd_open(rqstp, fhp, S_IFDIR, NFSD_MAY_READ, &file);
+        err = nfsd_open(rqstp, fhp, S_IFDIR, may_flags, &file);
         if (err)
                 goto out;
 
diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index 1dcd238e11a0..ec0611b2b738 100644
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -27,6 +27,8 @@
 #define NFSD_MAY_BYPASS_GSS             0x400
 #define NFSD_MAY_READ_IF_EXEC           0x800
 
+#define NFSD_MAY_64BIT_COOKIE           0x1000 /* 64 bit readdir cookies for >= NFSv3 */
+
 #define NFSD_MAY_CREATE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE)
 #define NFSD_MAY_REMOVE         (NFSD_MAY_EXEC|NFSD_MAY_WRITE|NFSD_MAY_TRUNC)