Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / net / sunrpc / svc_xprt.c

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 810ffe8a636b5f9197e6a9c21a59641f7151b0ac..7d1f9e928f69b23ff640643c06c0b8b86f95b80b 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -127,8 +127,8 @@ static void svc_xprt_free(struct kref *kref)
        struct svc_xprt *xprt =
                container_of(kref, struct svc_xprt, xpt_ref);
        struct module *owner = xprt->xpt_class->xcl_owner;
-       if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags)
-           && xprt->xpt_auth_cache != NULL)
+       if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags) &&
+           xprt->xpt_auth_cache != NULL)
                svcauth_unix_info_release(xprt->xpt_auth_cache);
        xprt->xpt_ops->xpo_free(xprt);
        module_put(owner);
@@ -835,8 +835,8 @@ static void svc_age_temp_xprts(unsigned long closure)
                 * through, close it. */
                if (!test_and_set_bit(XPT_OLD, &xprt->xpt_flags))
                        continue;
-               if (atomic_read(&xprt->xpt_ref.refcount) > 1
-                   || test_bit(XPT_BUSY, &xprt->xpt_flags))
+               if (atomic_read(&xprt->xpt_ref.refcount) > 1 ||
+                   test_bit(XPT_BUSY, &xprt->xpt_flags))
                        continue;
                svc_xprt_get(xprt);
                list_move(le, &to_be_aged);