Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f3d43c769d14b7065da7f62ec468b1fcb8cd6e06

Authored by J. Bruce Fields
Committed by Trond Myklebust
1 parent e4e20512cf
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

NLM/lockd: remove b_done 

We never actually set the b_done field any more; it's always zero.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from af8412d4283ef91356e65e0ed9b025b376aebded commit)

Showing 2 changed files with 3 additions and 10 deletions Side-by-side Diff

... ... @@ -638,9 +638,6 @@
638 638 if (task->tk_status < 0) {
639 639 /* RPC error: Re-insert for retransmission */
640 640 timeout = 10 * HZ;
641   - } else if (block->b_done) {
642   - /* Block already removed, kill it for real */
643   - timeout = 0;
644 641 } else {
645 642 /* Call was successful, now wait for client callback */
646 643 timeout = 60 * HZ;
647 644  
... ... @@ -709,13 +706,10 @@
709 706 break;
710 707 if (time_after(block->b_when,jiffies))
711 708 break;
712   - dprintk("nlmsvc_retry_blocked(%p, when=%ld, done=%d)\n",
713   - block, block->b_when, block->b_done);
  709 + dprintk("nlmsvc_retry_blocked(%p, when=%ld)\n",
  710 + block, block->b_when);
714 711 kref_get(&block->b_count);
715   - if (block->b_done)
716   - nlmsvc_unlink_block(block);
717   - else
718   - nlmsvc_grant_blocked(block);
  712 + nlmsvc_grant_blocked(block);
719 713 nlmsvc_release_block(block);
720 714 }
721 715  
include/linux/lockd/lockd.h
Diff comments   View file @ f3d43c7
... ... @@ -123,7 +123,6 @@
123 123 unsigned int b_id; /* block id */
124 124 unsigned char b_queued; /* re-queued */
125 125 unsigned char b_granted; /* VFS granted lock */
126   - unsigned char b_done; /* callback complete */
127 126 struct nlm_file * b_file; /* file in question */
128 127 };
129 128