[Ocfs2-devel] resend the new patch for bug 48 to remove incorrect autowrap in last mail

[Ocfs2-devel] resend the new patch for bug 48 to remove incorrect autowrap in last mail

[Sonic Zhang]

--- ocfs2.old/src/nm.c.old    2004-03-26 15:21:32.000000000 +0800
+++ ocfs2/src/nm.c    2004-03-27 09:22:06.176266560 +0800
@@ -119,6 +119,8 @@
         OcfsIpcCtxt.recv_sock = NULL;
     }
 
+    OcfsIpcCtxt.task = NULL;
+    
     /* signal main thread of ipcdlm's exit */
     complete (&(OcfsIpcCtxt.complete));
 
@@ -250,6 +252,7 @@
     __u64 cfg_seq_num;
     int which, pruned, prune_iters = 0;
     struct buffer_head *bh = NULL;
+    siginfo_t info;
 
     LOG_ENTRY ();
 
@@ -409,6 +412,7 @@
                 OCFS_BH_PUT_DATA(bh);
                 status = ocfs_write_bh(osb, bh, 0, NULL);
                 if (status < 0) {
+                    up(&(osb->publish_lock));
                     LOG_ERROR_STATUS (status);
                     goto finally;
                 }
@@ -439,6 +443,18 @@
         }
         set_current_state (TASK_INTERRUPTIBLE);
         schedule_timeout (osb->hbt - j);
+
+        if (signal_pending(current)) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+            /* ignore the actual signal */
+            dequeue_signal_lock(current, &current->blocked, &info);
+#else
+            spin_lock_irq(&current->sigmask_lock);
+            /* ignore the actual signal */
+            dequeue_signal(&current->blocked, &info);
+            spin_unlock_irq(&current->sigmask_lock);
+#endif
+        }
     }
 
         /* Flush all scheduled tasks */

[Ocfs2-devel] resend the new patch for bug 48 to remove incorrect autowrap in last mail

[Joel Becker]

Sonic,
	Please, send in proper kernel style.  TABs, not spaces.

Joel

On Sat, Mar 27, 2004 at 10:00:47AM +0800, Sonic Zhang wrote:
> --- ocfs2.old/src/nm.c.old    2004-03-26 15:21:32.000000000 +0800
> +++ ocfs2/src/nm.c    2004-03-27 09:22:06.176266560 +0800
> @@ -119,6 +119,8 @@
>         OcfsIpcCtxt.recv_sock = NULL;
>     }
> 
> +    OcfsIpcCtxt.task = NULL;
> +    
>     /* signal main thread of ipcdlm's exit */
>     complete (&(OcfsIpcCtxt.complete));
> 
> @@ -250,6 +252,7 @@
>     __u64 cfg_seq_num;
>     int which, pruned, prune_iters = 0;
>     struct buffer_head *bh = NULL;
> +    siginfo_t info;
> 
>     LOG_ENTRY ();
> 
> @@ -409,6 +412,7 @@
>                 OCFS_BH_PUT_DATA(bh);
>                 status = ocfs_write_bh(osb, bh, 0, NULL);
>                 if (status < 0) {
> +                    up(&(osb->publish_lock));
>                     LOG_ERROR_STATUS (status);
>                     goto finally;
>                 }
> @@ -439,6 +443,18 @@
>         }
>         set_current_state (TASK_INTERRUPTIBLE);
>         schedule_timeout (osb->hbt - j);
> +
> +        if (signal_pending(current)) {
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
> +            /* ignore the actual signal */
> +            dequeue_signal_lock(current, &current->blocked, &info);
> +#else
> +            spin_lock_irq(&current->sigmask_lock);
> +            /* ignore the actual signal */
> +            dequeue_signal(&current->blocked, &info);
> +            spin_unlock_irq(&current->sigmask_lock);
> +#endif
> +        }
>     }
> 
>         /* Flush all scheduled tasks */
> 
> 
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel@oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-devel

-- 

"Nothing is wrong with California that a rise in the ocean level
 wouldn't cure."
        - Ross MacDonald

Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127

[Ocfs2-devel] resend the new patch for bug 48 to remove incorrect autowrap in last mail

[Zhang, Sonic]

Hi,

	I failed to prevent Mozilla from converting the TABs to Spaces. So, I have to send the patch in attachment.



*********************************************
Sonic Zhang
Software Engineer
Intel China Software Lab
Tel: (086)021-52574545-1667
iNet: 752-1667
********************************************* 

-----Original Message-----
From: joel.becker@oracle.com [mailto:joel.becker@oracle.com] 
Sent: 2004��3��27�� 10:18
To: Zhang, Sonic
Cc: ocfs2-devel
Subject: Re: [Ocfs2-devel] resend the new patch for bug 48 to remove incorrect autowrap in last mail

Sonic,
	Please, send in proper kernel style.  TABs, not spaces.

Joel

On Sat, Mar 27, 2004 at 10:00:47AM +0800, Sonic Zhang wrote:
> --- ocfs2.old/src/nm.c.old    2004-03-26 15:21:32.000000000 +0800
> +++ ocfs2/src/nm.c    2004-03-27 09:22:06.176266560 +0800
> @@ -119,6 +119,8 @@
>         OcfsIpcCtxt.recv_sock = NULL;
>     }
> 
> +    OcfsIpcCtxt.task = NULL;
> +    
>     /* signal main thread of ipcdlm's exit */
>     complete (&(OcfsIpcCtxt.complete));
> 
> @@ -250,6 +252,7 @@
>     __u64 cfg_seq_num;
>     int which, pruned, prune_iters = 0;
>     struct buffer_head *bh = NULL;
> +    siginfo_t info;
> 
>     LOG_ENTRY ();
> 
> @@ -409,6 +412,7 @@
>                 OCFS_BH_PUT_DATA(bh);
>                 status = ocfs_write_bh(osb, bh, 0, NULL);
>                 if (status < 0) {
> +                    up(&(osb->publish_lock));
>                     LOG_ERROR_STATUS (status);
>                     goto finally;
>                 }
> @@ -439,6 +443,18 @@
>         }
>         set_current_state (TASK_INTERRUPTIBLE);
>         schedule_timeout (osb->hbt - j);
> +
> +        if (signal_pending(current)) {
> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
> +            /* ignore the actual signal */
> +            dequeue_signal_lock(current, &current->blocked, &info);
> +#else
> +            spin_lock_irq(&current->sigmask_lock);
> +            /* ignore the actual signal */
> +            dequeue_signal(&current->blocked, &info);
> +            spin_unlock_irq(&current->sigmask_lock);
> +#endif
> +        }
>     }
> 
>         /* Flush all scheduled tasks */
> 
> 
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel@oss.oracle.com
> http://oss.oracle.com/mailman/listinfo/ocfs2-devel

-- 

"Nothing is wrong with California that a rise in the ocean level
 wouldn't cure."
        - Ross MacDonald

Joel Becker
Senior Member of Technical Staff
Oracle Corporation
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ocfs2-nm-reboot1.patch
Type: application/octet-stream
Size: 1171 bytes
Desc: ocfs2-nm-reboot1.patch
Url : http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20040329/541f24f0/ocfs2-nm-reboot1.obj

[Ocfs2-devel] resend the new patch for bug 48 to remove incorrect autowrap in last mail

[Wim Coekaerts]

Sonic,

that bug you found in jbd, is that soemthing you forwarded on to
rhat/suse or do you want us to do that ? if you have generic kernel
fixes I want to make sure we get them fixed upstream

wim

[Ocfs2-devel] resend the new patch for bug 48 to remove incorrect autowrap in last mail

[Zhang, Sonic]

Hi Wim,

	You can help me to forward the patch to RedHat/Suse. I think the patch =
can be applied to all 2.6.x kernels.=20

	If you can't find the last one, I can attach it again.

------------------------------------------
--- linux-2.6.4a/fs/jbd/journal.c	2004-03-19 10:40:49.264613984 +0800
+++ linux-2.6.4/fs/jbd/journal.c	2004-03-19 10:41:12.091143824 +0800
@@ -832,10 +832,10 @@
 		bh =3D __getblk(journal->j_dev, blocknr, journal->j_blocksize);
 		lock_buffer(bh);
 		memset (bh->b_data, 0, journal->j_blocksize);
-		BUFFER_TRACE(bh, "marking dirty");
-		mark_buffer_dirty(bh);
 		BUFFER_TRACE(bh, "marking uptodate");
 		set_buffer_uptodate(bh);
+		BUFFER_TRACE(bh, "marking dirty");
+		mark_buffer_dirty(bh);
 		unlock_buffer(bh);
 		__brelse(bh);
 	}


*********************************************
Sonic Zhang
Software Engineer
Intel China Software Lab
Tel: (086)021-52574545-1667
iNet: 752-1667
*********************************************=20

-----Original Message-----
From: wim.coekaerts@oracle.com [mailto:wim.coekaerts@oracle.com]=20
Sent: 2004=C4=EA3=D4=C229=C8=D5 11:47
To: Zhang, Sonic
Cc: joel.becker@oracle.com; ocfs2-devel
Subject: Re: [Ocfs2-devel] resend the new patch for bug 48 to remove =
incorrect autowrap in last mail


Sonic,

that bug you found in jbd, is that soemthing you forwarded on to
rhat/suse or do you want us to do that ? if you have generic kernel
fixes I want to make sure we get them fixed upstream

wim