[PATCH] kNFSd: NFSv4: tweak nfsd_create_v3() for NFSv4

File creation in NFSv4 is almost the same as in NFSv3, with one minor
difference.  If an UNCHECKED create is done, and the file exists, we
don't set any attributes.  Exception: If size==0 is specified as part
of the attributes, then we do truncate the file, but only after processing
the rest of the OPEN.  (File creation is always part of an OPEN request.)

This patch defines a new argument *truncp to nfsd_create_v3(), which
will be NULL for v3 requests.  For v4 requests, it will point to a
variable which should be set to 1 if file truncation is still needed.

The logic in nfsd_create_v3() is changed as follows: If
  - *truncp is not NULL
  - the create is UNCHECKED
  - the file exists
then nfsd_create_v3() returns immediately.  If size==0 is specified,
then *truncp is set to 1.

This is kind of a hack, but the only alternative I could see was creating
a new routine nfsd_create_v4(), which would be identical to nfsd_create_v3()
except for this point.

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 0e3de324ec19f9910150b0a5907dc8e641c9c5cf..58f5e069d9a904cc55cdf225bd4c570d790d2bcb 100644 (file)
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -267,7 +267,7 @@ nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp,
        /* Now create the file and set attributes */
        nfserr = nfsd_create_v3(rqstp, dirfhp, argp->name, argp->len,
                                attr, newfhp,
-                               argp->createmode, argp->verf);
+                               argp->createmode, argp->verf, NULL);
 
        RETURN_STATUS(nfserr);
 }

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 3a01584341d17cb613d47f7811634408f91e0fd7..bfb9ef7eab474177304d2eb330ce70ddf8939164 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -907,7 +907,8 @@ out_nfserr:
 int
 nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp,
                char *fname, int flen, struct iattr *iap,
-               struct svc_fh *resfhp, int createmode, u32 *verifier)
+               struct svc_fh *resfhp, int createmode, u32 *verifier,
+               int *truncp)
 {
        struct dentry   *dentry, *dchild;
        struct inode    *dirp;
@@ -969,6 +970,16 @@ nfsd_create_v3(struct svc_rqst *rqstp, struct svc_fh *fhp,
                case NFS3_CREATE_UNCHECKED:
                        if (! S_ISREG(dchild->d_inode->i_mode))
                                err = nfserr_exist;
+                       else if (truncp) {
+                               /* in nfsv4, we need to treat this case a little
+                                * differently.  we don't want to truncate the
+                                * file now; this would be wrong if the OPEN
+                                * fails for some other reason.  furthermore,
+                                * if the size is nonzero, we should ignore it
+                                * according to spec!
+                                */
+                               *truncp = (iap->ia_valid & ATTR_SIZE) && !iap->ia_size;
+                       }
                        else {
                                iap->ia_valid &= ATTR_SIZE;
                                goto set_attr;

diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 9c267886c3fcc32a62c3e8a96eed35798b11c5b2..81077dfc144441d14e8c61d470b81aa403062a42 100644 (file)
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -90,7 +90,7 @@ int           nfsd_access(struct svc_rqst *, struct svc_fh *, u32 *);
 int            nfsd_create_v3(struct svc_rqst *, struct svc_fh *,
                                char *name, int len, struct iattr *attrs,
                                struct svc_fh *res, int createmode,
-                               u32 *verifier);
+                               u32 *verifier, int *truncp);
 int            nfsd_commit(struct svc_rqst *, struct svc_fh *,
                                off_t, unsigned long);
 #endif /* CONFIG_NFSD_V3 */