29c29
< __FBSDID("$FreeBSD: head/sys/fs/nfsserver/nfs_nfsdstate.c 224083 2011-07-16 08:05:41Z zack $");
---
> __FBSDID("$FreeBSD: head/sys/fs/nfsserver/nfs_nfsdstate.c 224086 2011-07-16 08:51:09Z zack $");
138c138
< int i;
---
> int i, error = 0;
147,148c147,150
< if (nfsrv_openpluslock > NFSRV_V4STATELIMIT)
< return (NFSERR_RESOURCE);
---
> if (nfsrv_openpluslock > NFSRV_V4STATELIMIT) {
> error = NFSERR_RESOURCE;
> goto out;
> }
231c233
< return (0);
---
> goto out;
277c279,280
< return (NFSERR_CLIDINUSE);
---
> error = NFSERR_CLIDINUSE;
> goto out;
338c341
< return (0);
---
> goto out;
391c394,397
< return (0);
---
>
> out:
> NFSEXITCODE2(error, nd);
> return (error);
409,410c415,418
< if (nfsrvboottime != clientid.lval[0])
< return (NFSERR_STALECLIENTID);
---
> if (nfsrvboottime != clientid.lval[0]) {
> error = NFSERR_STALECLIENTID;
> goto out;
> }
453c461
< return (error);
---
> goto out;
528a537,539
>
> out:
> NFSEXITCODE2(error, nd);
540c551
< int i;
---
> int i, error = 0;
573c584,585
< return (EPERM);
---
> error = EPERM;
> goto out;
593c605,608
< return (0);
---
>
> out:
> NFSEXITCODE(error);
> return (error);
1231a1247
> int error = 0;
1244,1245c1260,1263
< if (stp == LIST_END(hp))
< return (NFSERR_BADSTATEID);
---
> if (stp == LIST_END(hp)) {
> error = NFSERR_BADSTATEID;
> goto out;
> }
1247c1265,1268
< return (0);
---
>
> out:
> NFSEXITCODE(error);
> return (error);
1326c1347
< return (error);
---
> goto out;
1332,1333c1353,1356
< nfsrv_openpluslock > NFSRV_V4STATELIMIT)
< return (NFSERR_RESOURCE);
---
> nfsrv_openpluslock > NFSRV_V4STATELIMIT) {
> error = NFSERR_RESOURCE;
> goto out;
> }
1549,1556c1572
< if (other_lop)
< FREE((caddr_t)other_lop, M_NFSDLOCK);
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< return (error);
---
> goto out;
1585,1593c1601
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< /*
< * Called to lock or unlock, so the lock has gone away.
< */
< return (error);
---
> goto out;
1641,1648c1649,1650
< if (other_lop)
< FREE((caddr_t)other_lop, M_NFSDLOCK);
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< return (NFSERR_OPENMODE);
---
> error = NFSERR_OPENMODE;
> goto out;
1673,1677d1674
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
1679c1676
< return (NFSERR_PERM);
---
> error = NFSERR_PERM;
1681c1678,1679
< return (NFSERR_OPENMODE);
---
> error = NFSERR_OPENMODE;
> goto out;
1688,1693c1686
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< return (0);
---
> goto out;
1711c1704,1705
< return (ret);
---
> error = ret;
> goto out;
1717,1722c1711
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< return (0);
---
> goto out;
1776c1765,1766
< return (ret);
---
> error = ret;
> goto out;
1804,1809c1794
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< return (0);
---
> goto out;
1880,1885c1865
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< return (error);
---
> goto out;
1895,1900c1875
< if (haslock) {
< NFSLOCKV4ROOTMUTEX();
< nfsv4_unlock(&nfsv4rootfs_lock, 1);
< NFSUNLOCKV4ROOTMUTEX();
< }
< return (0);
---
> goto out;
1952a1928,1929
>
> out:
1960c1937,1938
< return (0);
---
> NFSEXITCODE2(error, nd);
> return (error);
1977c1955
< int error, haslock = 0, ret, readonly = 0, getfhret = 0;
---
> int error = 0, haslock = 0, ret, readonly = 0, getfhret = 0;
1987c1965
< return (error);
---
> goto out;
1996,1997c1974,1977
< if (nfsrv_openpluslock > NFSRV_V4STATELIMIT)
< return (NFSERR_RESOURCE);
---
> if (nfsrv_openpluslock > NFSRV_V4STATELIMIT) {
> error = NFSERR_RESOURCE;
> goto out;
> }
2055c2035
< return (error);
---
> goto out;
2065c2045
< return (0);
---
> goto out;
2085c2065
< return (error);
---
> goto out;
2116c2096,2097
< return (NFSERR_EXPIRED);
---
> error = NFSERR_EXPIRED;
> goto out;
2151c2132
< return (error);
---
> goto out;
2192c2173,2174
< return (ret);
---
> error = ret;
> goto out;
2204c2186,2189
< return (0);
---
>
> out:
> NFSEXITCODE2(error, nd);
> return (error);
2221c2206
< int error, haslock = 0, ret, delegate = 1, writedeleg = 1;
---
> int error = 0, haslock = 0, ret, delegate = 1, writedeleg = 1;
2237c2222,2223
< return (NFSERR_EXPIRED);
---
> error = NFSERR_EXPIRED;
> goto out;
2308c2294,2295
< return (NFSERR_EXPIRED);
---
> error = NFSERR_EXPIRED;
> goto out;
2335c2322
< return (error);
---
> goto out;
2369c2356,2357
< return (NFSERR_EXPIRED);
---
> error = NFSERR_EXPIRED;
> goto out;
2434c2422
< return (error);
---
> goto out;
2485c2473,2474
< return (ret);
---
> error = ret;
> goto out;
2857a2847,2849
>
> out:
> NFSEXITCODE2(error, nd);
2872c2864
< int error, gotstate = 0, len = 0;
---
> int error = 0, gotstate = 0, len = 0;
2881c2873
< return (error);
---
> goto out;
2928c2920
< return (error);
---
> goto out;
2981c2973,2974
< return (NFSERR_INVAL);
---
> error = NFSERR_INVAL;
> goto out;
2995a2989,2991
>
> out:
> NFSEXITCODE2(error, nd);
3008c3004
< int error;
---
> int error = 0;
3017c3013
< return (error);
---
> goto out;
3053c3049,3050
< return (0);
---
> error = 0;
> goto out;
3057c3054
< return (error);
---
> goto out;
3064c3061,3062
< return (NFSERR_BADSTATEID);
---
> error = NFSERR_BADSTATEID;
> goto out;
3071c3069,3073
< return (0);
---
> error = 0;
>
> out:
> NFSEXITCODE(error);
> return (error);
3083c3085
< int error;
---
> int error = 0;
3091c3093
< return (error);
---
> goto out;
3101c3103
< return (error);
---
> goto out;
3119c3121,3122
< return (NFSERR_LOCKSHELD);
---
> error = NFSERR_LOCKSHELD;
> goto out;
3127c3130,3133
< return (0);
---
>
> out:
> NFSEXITCODE(error);
> return (error);
3153a3160
> NFSEXITCODE(error);
3408a3416
> int error = 0;
3424c3432
< return (0);
---
> goto out;
3430,3431c3438,3441
< if (stp->ls_op->rc_flag & RC_INPROG)
< return (NFSERR_DONTREPLY);
---
> if (stp->ls_op->rc_flag & RC_INPROG) {
> error = NFSERR_DONTREPLY;
> goto out;
> }
3435c3445,3446
< return (NFSERR_REPLYFROMCACHE);
---
> error = NFSERR_REPLYFROMCACHE;
> goto out;
3437c3448,3452
< return (NFSERR_BADSEQID);
---
> error = NFSERR_BADSEQID;
>
> out:
> NFSEXITCODE2(error, nd);
> return (error);
3560a3576
> NFSEXITCODE2(error, nd);
3593c3609
< int ret;
---
> int ret = 0;
3601,3602c3617,3620
< if (clientid.lval[0] != nfsrvboottime)
< return (NFSERR_STALECLIENTID);
---
> if (clientid.lval[0] != nfsrvboottime) {
> ret = NFSERR_STALECLIENTID;
> goto out;
> }
3604,3605c3622,3625
< specialid == 0)
< return (NFSERR_STALESTATEID);
---
> specialid == 0) {
> ret = NFSERR_STALESTATEID;
> goto out;
> }
3613c3633
< return (0);
---
> goto out;
3617a3638,3640
>
> out:
> NFSEXITCODE(ret);
3626a3650
> int error = 0;
3629,3630c3653,3656
< if (flags & NFSLCK_RECLAIM)
< return (NFSERR_NOGRACE);
---
> if (flags & NFSLCK_RECLAIM) {
> error = NFSERR_NOGRACE;
> goto out;
> }
3632,3633c3658,3661
< if (!(flags & NFSLCK_RECLAIM))
< return (NFSERR_GRACE);
---
> if (!(flags & NFSLCK_RECLAIM)) {
> error = NFSERR_GRACE;
> goto out;
> }
3644c3672,3675
< return (0);
---
>
> out:
> NFSEXITCODE(error);
> return (error);
3792a3824,3825
>
> NFSEXITCODE(error);
4320c4353,4354
< return (-1);
---
> error = -1;
> goto out;
4335c4369,4370
< return (NFSERR_DELAY);
---
> error = NFSERR_DELAY;
> goto out;
4391c4426,4427
< return (NFSERR_DELAY);
---
> error = NFSERR_DELAY;
> goto out;
4407c4443,4444
< return (NFSERR_DELAY);
---
> error = NFSERR_DELAY;
> goto out;
4435c4472,4473
< return (NFSERR_PERM);
---
> error = NFSERR_PERM;
> goto out;
4437c4475,4476
< return (-1);
---
> error = -1;
> goto out;
4462c4501,4505
< return (-1);
---
> error = -1;
>
> out:
> NFSEXITCODE(error);
> return (error);
4494,4495c4537,4538
< return (0);
< return (error);
---
> error = 0;
> goto out;
4514c4557
< return (error);
---
> goto out;
4534a4578,4580
>
> out:
> NFSEXITCODE(error);
4552c4598
< int ret;
---
> int ret = 0;
4564c4610
< return (ret);
---
> goto out;
4569c4615,4617
< return (0);
---
> out:
> NFSEXITCODE(ret);
> return (ret);
4703c4751
< return (0);
---
> goto out;
4714a4763,4765
>
> out:
> NFSEXITCODE2(error, nd);
4734c4785
< int error;
---
> int error = 0;
4740c4791
< return (0);
---
> goto out;
4753,4754c4804,4805
< return (0);
< return (error);
---
> error = 0;
> goto out;
4766c4817
< return (0);
---
> goto out;
4786c4837
< return (0);
---
> goto out;
4817c4868,4872
< return (0);
---
> error = 0;
>
> out:
> NFSEXITCODE2(error, nd);
> return (error);
4999a5055,5056
>
> NFSEXITCODE(error);
5082c5139
< int error, ltype, oldltype;
---
> int error = 0, ltype, oldltype;
5098c5155
< return (0);
---
> goto out;
5118a5176,5178
>
> out:
> NFSEXITCODE(error);