Very Computer

This patch makes three small changes to nfsd_readdir().

First, the 'filldir' routine for NFSv4 may return an arbitrary error,
which should become the return value for nfsd_readdir().  I implemented
this by adding an 'nfserr' field to the 'struct readdir_cd'.

Second, in NFSv4 the caller of nfsd_readdir() will specify an attribute
bitmap, which must be communicated to the 'filldir' routine.  I implemented

field in the 'struct readdir_cd'.  (The bitmap is not interpreted in any
way by nfsd_readdir().)

Finally, NFSv4 defines a new error nfserr_readdir_nospc, which indicates
that there was not enough buffer space to encode a single entry.

--- old/include/linux/nfsd/nfsd.h       Fri Aug  9 10:13:11 2002

        char                    plus;           /* readdirplus */
        char                    eob;            /* end of buffer */
        char                    dotonly;
+       int                     nfserr;         /* v4 only */
+       u32                     bmval[2];       /* v4 only */
 };
 typedef int            (*encode_dent_fn)(struct readdir_cd *, const char *,

                                unsigned long size);
 int            nfsd_readdir(struct svc_rqst *, struct svc_fh *,
                                loff_t, encode_dent_fn,
-                               u32 *buffer, int *countp, u32 *verf);
+                               u32 *buffer, int *countp, u32 *verf,
+                               u32 *bmval);
 int            nfsd_statfs(struct svc_rqst *, struct svc_fh *,
                                struct statfs *);

--- old/fs/nfsd/vfs.c   Fri Aug  9 10:13:11 2002

  */
 int
 nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset,
-             encode_dent_fn func, u32 *buffer, int *countp, u32 *verf)
+             encode_dent_fn func, u32 *buffer, int *countp, u32 *verf, u32 *bmval)
 {
        u32             *p;

        cd.buffer = buffer;
        cd.buflen = *countp; /* count of words */
        cd.dirfh  = fhp;
+       if (bmval) {
+               cd.bmval[0] = bmval[0];
+               cd.bmval[1] = bmval[1];
+       }

        /*

                if (err < 0)
                        goto out_nfserr;

+               err = cd.nfserr;
+               if (err)
+                       goto out_close;
        } while (oldlen != cd.buflen && !cd.eob);

+       err = nfserr_readdir_nospc;
+       if (rqstp->rq_vers == 4 && cd.eob && cd.buffer == buffer)
+               goto out_close;
+
        /* If we didn't fill the buffer completely, we're at EOF */
        eof = !cd.eob;

--- old/fs/nfsd/nfsproc.c       Wed Jul 24 16:03:24 2002

        /* Read directory and encode entries on the fly */
        nfserr = nfsd_readdir(rqstp, &argp->fh, (loff_t) argp->cookie,
                              nfssvc_encode_entry,
-                             buffer, &count, NULL);
+                             buffer, &count, NULL, NULL);
        resp->count = count;

        fh_put(&argp->fh);
--- old/fs/nfsd/nfs3proc.c      Fri Aug  9 10:13:11 2002

        fh_copy(&resp->fh, &argp->fh);
        nfserr = nfsd_readdir(rqstp, &resp->fh, (loff_t) argp->cookie,
                                        nfs3svc_encode_entry,
-                                       buffer, &count, argp->verf);
+                                       buffer, &count, argp->verf, NULL);
        memcpy(resp->verf, argp->verf, 8);
        resp->count = count;

        fh_copy(&resp->fh, &argp->fh);
        nfserr = nfsd_readdir(rqstp, &resp->fh, (loff_t) argp->cookie,
                                        nfs3svc_encode_entry_plus,
-                                       buffer, &count, argp->verf);
+                                       buffer, &count, argp->verf, NULL);
        memcpy(resp->verf, argp->verf, 8);
        resp->count = count;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/