Issue 854: Broken (off by one) intraline diff
Status:  Duplicate
Merged:  issue 853
Owner: ----
Closed:  May 2011
Reported by di...@google.com, Feb 23, 2011
Affected Version: 2.1.6.1

What steps will reproduce the problem?
1. Checkout a copy of vanilla kernel v2.6.32
2. Apply the path below and commit
3. Push the commit for code review (against a branch based of v2.6.32)

What is the expected output? What do you see instead?
Opening the side by side diff view it should show how the parameter has been wrapped with a function call instead it shows as if the semicolon was added.


Please provide any additional information below.
This issue shows with intraline diff but it seems similar (also an off-by-one) with an earlier reported issue (853).

The patch I used to reproduce the issue (should probably work on other kernel versions too):
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5050,7 +5050,7 @@ void netdev_run_todo(void)
 
                /* paranoia */
                BUG_ON(atomic_read(&dev->refcnt));
-               WARN_ON(dev->ip_ptr);
+               WARN_ON(rcu_dereference_raw(dev->ip_ptr));
                WARN_ON(dev->ip6_ptr);
                WARN_ON(dev->dn_ptr);
 

May 16, 2011
#1 sop@google.com
(No comment was entered for this change.)
Status: Accepted
Labels: Milestone-2.1.7
May 16, 2011
#2 sop@google.com
(No comment was entered for this change.)
Labels: -Priority-Minor Priority-Critical
May 16, 2011
#3 sop@google.com
This is identical to 853. The code is the same in upstream JGit (just operating on character or line sized records).
Status: Duplicate
Labels: Component-JGit
Mergedinto: 853