knfsd: nfsv4 delegation recall should take reference on client

[linux-2.6] / fs / nfsd / export.c

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 06d5cd4a52c49e0973b7199726e9f8fa0f956667..cba899a3494ed56d5e9d9342a617d841ca2bfdd6 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -564,9 +564,10 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
 
        /* flags */
        err = get_int(&mesg, &an_int);
-       if (err == -ENOENT)
+       if (err == -ENOENT) {
+               err = 0;
                set_bit(CACHE_NEGATIVE, &exp.h.flags);
-       else {
+       } else {
                if (err || an_int < 0) goto out;        
                exp.ex_flags= an_int;
        
@@ -641,6 +642,7 @@ static int svc_export_parse(struct cache_detail *cd, char *mesg, int mlen)
 
 static void exp_flags(struct seq_file *m, int flag, int fsid,
                uid_t anonu, uid_t anong, struct nfsd4_fs_locations *fslocs);
+static void show_secinfo(struct seq_file *m, struct svc_export *exp);
 
 static int svc_export_show(struct seq_file *m,
                           struct cache_detail *cd,
@@ -670,6 +672,7 @@ static int svc_export_show(struct seq_file *m,
                                seq_printf(m, "%02x", exp->ex_uuid[i]);
                        }
                }
+               show_secinfo(m, exp);
        }
        seq_puts(m, ")\n");
        return 0;
@@ -1263,7 +1266,7 @@ struct svc_export *
 rqst_exp_get_by_name(struct svc_rqst *rqstp, struct vfsmount *mnt,
                struct dentry *dentry)
 {
-       struct svc_export *gssexp, *exp = NULL;
+       struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);
 
        if (rqstp->rq_client == NULL)
                goto gss;
@@ -1286,7 +1289,7 @@ gss:
                                                &rqstp->rq_chandle);
        if (PTR_ERR(gssexp) == -ENOENT)
                return exp;
-       if (exp && !IS_ERR(exp))
+       if (!IS_ERR(exp))
                exp_put(exp);
        return gssexp;
 }
@@ -1294,7 +1297,7 @@ gss:
 struct svc_export *
 rqst_exp_find(struct svc_rqst *rqstp, int fsid_type, u32 *fsidv)
 {
-       struct svc_export *gssexp, *exp = NULL;
+       struct svc_export *gssexp, *exp = ERR_PTR(-ENOENT);
 
        if (rqstp->rq_client == NULL)
                goto gss;
@@ -1316,7 +1319,7 @@ gss:
                                                &rqstp->rq_chandle);
        if (PTR_ERR(gssexp) == -ENOENT)
                return exp;
-       if (exp && !IS_ERR(exp))
+       if (!IS_ERR(exp))
                exp_put(exp);
        return gssexp;
 }
@@ -1467,6 +1470,33 @@ static void show_expflags(struct seq_file *m, int flags, int mask)
        }
 }
 
+static void show_secinfo_flags(struct seq_file *m, int flags)
+{
+       seq_printf(m, ",");
+       show_expflags(m, flags, NFSEXP_SECINFO_FLAGS);
+}
+
+static void show_secinfo(struct seq_file *m, struct svc_export *exp)
+{
+       struct exp_flavor_info *f;
+       struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
+       int lastflags = 0, first = 0;
+
+       if (exp->ex_nflavors == 0)
+               return;
+       for (f = exp->ex_flavors; f < end; f++) {
+               if (first || f->flags != lastflags) {
+                       if (!first)
+                               show_secinfo_flags(m, lastflags);
+                       seq_printf(m, ",sec=%d", f->pseudoflavor);
+                       lastflags = f->flags;
+               } else {
+                       seq_printf(m, ":%d", f->pseudoflavor);
+               }
+       }
+       show_secinfo_flags(m, lastflags);
+}
+
 static void exp_flags(struct seq_file *m, int flag, int fsid,
                uid_t anonu, uid_t anong, struct nfsd4_fs_locations *fsloc)
 {
@@ -1474,9 +1504,9 @@ static void exp_flags(struct seq_file *m, int flag, int fsid,
        if (flag & NFSEXP_FSID)
                seq_printf(m, ",fsid=%d", fsid);
        if (anonu != (uid_t)-2 && anonu != (0x10000-2))
-               seq_printf(m, ",sanonuid=%d", anonu);
+               seq_printf(m, ",anonuid=%u", anonu);
        if (anong != (gid_t)-2 && anong != (0x10000-2))
-               seq_printf(m, ",sanongid=%d", anong);
+               seq_printf(m, ",anongid=%u", anong);
        if (fsloc && fsloc->locations_count > 0) {
                char *loctype = (fsloc->migrated) ? "refer" : "replicas";
                int i;