* [Drbd-dev] [PATCH] 2.6.30 related fixes
@ 2009-05-11 14:43 Nikola Ciprich
2009-05-11 15:09 ` Lars Ellenberg
0 siblings, 1 reply; 3+ messages in thread
From: Nikola Ciprich @ 2009-05-11 14:43 UTC (permalink / raw)
To: drbd-dev; +Cc: nikola.ciprich
[-- Attachment #1: Type: text/plain, Size: 742 bytes --]
Hi,
linux 1faa16d22877f4839bd433547d770c676d1d964c changes congestion logic to sync/async
based. attached patch causes use of BDI_async_congested instead of old BDI_write_congested
for new kernels
in addition, 99b76233803beab302123d243eea9e41149804f3 removes proc::owner attribute.
according to commit comment, its use should just be removed, so second patch does just that.
everything seems to work then.
please apply.
regards
nik
--
-------------------------------------
Nikola CIPRICH
LinuxBox.cz, s.r.o.
28. rijna 168, 709 01 Ostrava
tel.: +420 596 603 142
fax: +420 596 621 273
mobil: +420 777 093 799
www.linuxbox.cz
mobil servis: +420 737 238 656
email servis: servis@linuxbox.cz
-------------------------------------
[-- Attachment #2: drbd-8.3.1-fix-BDI_write_congested.diff --]
[-- Type: text/plain, Size: 592 bytes --]
diff -Naur drbd-8.3.1/drbd/drbd_wrappers.h drbd-8.3.1-fix-BDI_write_congested/drbd/drbd_wrappers.h
--- drbd-8.3.1/drbd/drbd_wrappers.h 2009-03-26 15:58:33.000000000 +0100
+++ drbd-8.3.1-fix-BDI_write_congested/drbd/drbd_wrappers.h 2009-05-11 16:10:21.836674009 +0200
@@ -55,6 +55,10 @@
return 0;
}
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)
+#define BDI_write_congested BDI_async_congested
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
/* Before Linux-2.6.24 bie_endio() had the size of the bio as second argument.
See 6712ecf8f648118c3363c142196418f89a510b90 */
[-- Attachment #3: drbd-8.3.1-remove-proc-owner.diff --]
[-- Type: text/plain, Size: 433 bytes --]
diff -Naur drbd-8.3.1/drbd/drbd_main.c drbd-8.3.1-remove-proc-owner/drbd/drbd_main.c
--- drbd-8.3.1/drbd/drbd_main.c 2009-03-26 15:58:33.000000000 +0100
+++ drbd-8.3.1-remove-proc-owner/drbd/drbd_main.c 2009-05-11 16:13:33.936999632 +0200
@@ -3116,7 +3116,6 @@
}
drbd_proc->proc_fops = &drbd_proc_fops;
- drbd_proc->owner = THIS_MODULE;
#else
# error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
#endif
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Drbd-dev] [PATCH] 2.6.30 related fixes
2009-05-11 14:43 [Drbd-dev] [PATCH] 2.6.30 related fixes Nikola Ciprich
@ 2009-05-11 15:09 ` Lars Ellenberg
2009-05-11 15:19 ` Nikola Ciprich
0 siblings, 1 reply; 3+ messages in thread
From: Lars Ellenberg @ 2009-05-11 15:09 UTC (permalink / raw)
To: drbd-dev
On Mon, May 11, 2009 at 04:43:47PM +0200, Nikola Ciprich wrote:
> Hi,
> linux 1faa16d22877f4839bd433547d770c676d1d964c changes congestion logic to sync/async
> based. attached patch causes use of BDI_async_congested instead of old BDI_write_congested
> for new kernels
>
> in addition, 99b76233803beab302123d243eea9e41149804f3 removes proc::owner attribute.
> according to commit comment, its use should just be removed, so second patch does just that.
> everything seems to work then.
> please apply.
> regards
> nik
>
thanks, but too late.
I guess we have to push to public more frequently.
> --
> -------------------------------------
> Nikola CIPRICH
> LinuxBox.cz, s.r.o.
> 28. rijna 168, 709 01 Ostrava
>
> tel.: +420 596 603 142
> fax: +420 596 621 273
> mobil: +420 777 093 799
>
> www.linuxbox.cz
>
> mobil servis: +420 737 238 656
> email servis: servis@linuxbox.cz
> -------------------------------------
> diff -Naur drbd-8.3.1/drbd/drbd_wrappers.h drbd-8.3.1-fix-BDI_write_congested/drbd/drbd_wrappers.h
> --- drbd-8.3.1/drbd/drbd_wrappers.h 2009-03-26 15:58:33.000000000 +0100
> +++ drbd-8.3.1-fix-BDI_write_congested/drbd/drbd_wrappers.h 2009-05-11 16:10:21.836674009 +0200
> @@ -55,6 +55,10 @@
> return 0;
> }
>
> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)
> +#define BDI_write_congested BDI_async_congested
> +#endif
> +
> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
> /* Before Linux-2.6.24 bie_endio() had the size of the bio as second argument.
> See 6712ecf8f648118c3363c142196418f89a510b90 */
> diff -Naur drbd-8.3.1/drbd/drbd_main.c drbd-8.3.1-remove-proc-owner/drbd/drbd_main.c
> --- drbd-8.3.1/drbd/drbd_main.c 2009-03-26 15:58:33.000000000 +0100
> +++ drbd-8.3.1-remove-proc-owner/drbd/drbd_main.c 2009-05-11 16:13:33.936999632 +0200
> @@ -3116,7 +3116,6 @@
> }
>
> drbd_proc->proc_fops = &drbd_proc_fops;
> - drbd_proc->owner = THIS_MODULE;
> #else
> # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
> #endif
--
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com
DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Drbd-dev] [PATCH] 2.6.30 related fixes
2009-05-11 15:09 ` Lars Ellenberg
@ 2009-05-11 15:19 ` Nikola Ciprich
0 siblings, 0 replies; 3+ messages in thread
From: Nikola Ciprich @ 2009-05-11 15:19 UTC (permalink / raw)
To: drbd-dev; +Cc: nikola.ciprich
well, my fault for not checking the latest git first :(
but releasing more often will surely be appreciated ;)
regards
nik
On Mon, May 11, 2009 at 05:09:44PM +0200, Lars Ellenberg wrote:
> On Mon, May 11, 2009 at 04:43:47PM +0200, Nikola Ciprich wrote:
> > Hi,
> > linux 1faa16d22877f4839bd433547d770c676d1d964c changes congestion logic to sync/async
> > based. attached patch causes use of BDI_async_congested instead of old BDI_write_congested
> > for new kernels
> >
> > in addition, 99b76233803beab302123d243eea9e41149804f3 removes proc::owner attribute.
> > according to commit comment, its use should just be removed, so second patch does just that.
> > everything seems to work then.
> > please apply.
> > regards
> > nik
> >
>
> thanks, but too late.
> I guess we have to push to public more frequently.
>
> > --
> > -------------------------------------
> > Nikola CIPRICH
> > LinuxBox.cz, s.r.o.
> > 28. rijna 168, 709 01 Ostrava
> >
> > tel.: +420 596 603 142
> > fax: +420 596 621 273
> > mobil: +420 777 093 799
> >
> > www.linuxbox.cz
> >
> > mobil servis: +420 737 238 656
> > email servis: servis@linuxbox.cz
> > -------------------------------------
>
> > diff -Naur drbd-8.3.1/drbd/drbd_wrappers.h drbd-8.3.1-fix-BDI_write_congested/drbd/drbd_wrappers.h
> > --- drbd-8.3.1/drbd/drbd_wrappers.h 2009-03-26 15:58:33.000000000 +0100
> > +++ drbd-8.3.1-fix-BDI_write_congested/drbd/drbd_wrappers.h 2009-05-11 16:10:21.836674009 +0200
> > @@ -55,6 +55,10 @@
> > return 0;
> > }
> >
> > +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)
> > +#define BDI_write_congested BDI_async_congested
> > +#endif
> > +
> > #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
> > /* Before Linux-2.6.24 bie_endio() had the size of the bio as second argument.
> > See 6712ecf8f648118c3363c142196418f89a510b90 */
>
> > diff -Naur drbd-8.3.1/drbd/drbd_main.c drbd-8.3.1-remove-proc-owner/drbd/drbd_main.c
> > --- drbd-8.3.1/drbd/drbd_main.c 2009-03-26 15:58:33.000000000 +0100
> > +++ drbd-8.3.1-remove-proc-owner/drbd/drbd_main.c 2009-05-11 16:13:33.936999632 +0200
> > @@ -3116,7 +3116,6 @@
> > }
> >
> > drbd_proc->proc_fops = &drbd_proc_fops;
> > - drbd_proc->owner = THIS_MODULE;
> > #else
> > # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
> > #endif
>
>
> --
> : Lars Ellenberg
> : LINBIT | Your Way to High Availability
> : DRBD/HA support and consulting http://www.linbit.com
>
> DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.
> _______________________________________________
> drbd-dev mailing list
> drbd-dev@lists.linbit.com
> http://lists.linbit.com/mailman/listinfo/drbd-dev
>
--
-------------------------------------
Nikola CIPRICH
LinuxBox.cz, s.r.o.
28. rijna 168, 709 01 Ostrava
tel.: +420 596 603 142
fax: +420 596 621 273
mobil: +420 777 093 799
www.linuxbox.cz
mobil servis: +420 737 238 656
email servis: servis@linuxbox.cz
-------------------------------------
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-11 15:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-11 14:43 [Drbd-dev] [PATCH] 2.6.30 related fixes Nikola Ciprich
2009-05-11 15:09 ` Lars Ellenberg
2009-05-11 15:19 ` Nikola Ciprich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox