Pull sbs into release branch

[linux-2.6-omap-h63xx.git] / fs / nfsd / export.c

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index c7bbf460b009d60b503864b481f8ca5cbb846397..2d295dda4c1d63c774970f7baa76403658ccae4f 100644 (file)
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1265,7 +1265,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;
@@ -1288,7 +1288,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;
 }
@@ -1296,7 +1296,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;
@@ -1318,7 +1318,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;
 }
@@ -1503,9 +1503,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;