Patched in Tegra support.

1 files changed, 7 insertions, 12 deletions

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 21171f0c647..d27aab11f32 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -11,7 +11,6 @@
 #include <linux/time.h>
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/share.h>
-#include <linux/sunrpc/svc_xprt.h>
 
 #define NLMDBG_FACILITY         NLMDBG_CLIENT
 
@@ -68,8 +67,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,
 
         /* Obtain file pointer. Not used by FREE_ALL call. */
         if (filp != NULL) {
-                error = cast_status(nlm_lookup_file(rqstp, &file, &lock->fh));
-                if (error != 0)
+                if ((error = nlm_lookup_file(rqstp, &file, &lock->fh)) != 0)
                         goto no_locks;
                 *filp = file;
 
@@ -177,14 +175,13 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
-        struct net *net = SVC_NET(rqstp);
 
         dprintk("lockd: CANCEL        called\n");
 
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace(net)) {
+        if (locks_in_grace()) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -194,7 +191,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Try to cancel request. */
-        resp->status = cast_status(nlmsvc_cancel_blocked(net, file, &argp->lock));
+        resp->status = cast_status(nlmsvc_cancel_blocked(file, &argp->lock));
 
         dprintk("lockd: CANCEL        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -211,14 +208,13 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
 {
         struct nlm_host *host;
         struct nlm_file *file;
-        struct net *net = SVC_NET(rqstp);
 
         dprintk("lockd: UNLOCK        called\n");
 
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace(net)) {
+        if (locks_in_grace()) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -228,7 +224,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_args *argp,
                 return resp->status == nlm_drop_reply ? rpc_drop_reply :rpc_success;
 
         /* Now try to remove the lock */
-        resp->status = cast_status(nlmsvc_unlock(net, file, &argp->lock));
+        resp->status = cast_status(nlmsvc_unlock(file, &argp->lock));
 
         dprintk("lockd: UNLOCK        status %d\n", ntohl(resp->status));
         nlmsvc_release_host(host);
@@ -298,7 +294,6 @@ static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args
                 return rpc_system_err;
 
         call = nlm_alloc_call(host);
-        nlmsvc_release_host(host);
         if (call == NULL)
                 return rpc_system_err;
 
@@ -366,7 +361,7 @@ nlmsvc_proc_share(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept new lock requests during grace period */
-        if (locks_in_grace(SVC_NET(rqstp)) && !argp->reclaim) {
+        if (locks_in_grace() && !argp->reclaim) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }
@@ -399,7 +394,7 @@ nlmsvc_proc_unshare(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         /* Don't accept requests during grace period */
-        if (locks_in_grace(SVC_NET(rqstp))) {
+        if (locks_in_grace()) {
                 resp->status = nlm_lck_denied_grace_period;
                 return rpc_success;
         }