[Qemu-devel] [RFC PATCH v0 0/2] gluster: licence change and cleanups

[Qemu-devel] [RFC PATCH v0 0/2] gluster: licence change and cleanups

[Bharata B Rao]

Licence change of gluster driver from GPLv2 to GPLv2+ and some cleanups.

Bharata B Rao (2):
  gluster: Change licence to GPLv2+
  gluster: Remove unused defines and header include

 block/gluster.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

-- 
1.7.11.7

[Qemu-devel] [RFC PATCH v0 1/2] gluster: Change licence to GPLv2+

[Bharata B Rao]

Pipe handling mechanism in gluster driver was based on similar implementation
in RBD driver and hence had GPLv2 and associated copyright information.
After changing gluster driver to coroutine based implementation, the pipe
handling code no longer exists and hence change gluster driver's licence to
GPLv2+ and remove RBD copyrights.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
---
 block/gluster.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index a009b15..ba56005 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -3,17 +3,9 @@
  *
  * Copyright (C) 2012 Bharata B Rao <bharata@linux.vnet.ibm.com>
  *
- * Pipe handling mechanism in AIO implementation is derived from
- * block/rbd.c. Hence,
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
  *
- * Copyright (C) 2010-2011 Christian Brunner <chb@muc.de>,
- *                         Josh Durgin <josh.durgin@dreamhost.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- * Contributions after 2012-01-13 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
  */
 #include <glusterfs/api/glfs.h>
 #include "block/block_int.h"
-- 
1.7.11.7

Re: [Qemu-devel] [RFC PATCH v0 1/2] gluster: Change licence to GPLv2+

[Stefan Hajnoczi]

On Wed, Jan 29, 2014 at 07:59:55PM +0530, Bharata B Rao wrote:
> Pipe handling mechanism in gluster driver was based on similar implementation
> in RBD driver and hence had GPLv2 and associated copyright information.
> After changing gluster driver to coroutine based implementation, the pipe
> handling code no longer exists and hence change gluster driver's licence to
> GPLv2+ and remove RBD copyrights.
> 
> Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
> ---
>  block/gluster.c | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/block/gluster.c b/block/gluster.c
> index a009b15..ba56005 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -3,17 +3,9 @@
>   *
>   * Copyright (C) 2012 Bharata B Rao <bharata@linux.vnet.ibm.com>
>   *
> - * Pipe handling mechanism in AIO implementation is derived from
> - * block/rbd.c. Hence,
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> + * See the COPYING file in the top-level directory.
>   *
> - * Copyright (C) 2010-2011 Christian Brunner <chb@muc.de>,
> - *                         Josh Durgin <josh.durgin@dreamhost.com>
> - *
> - * This work is licensed under the terms of the GNU GPL, version 2.  See
> - * the COPYING file in the top-level directory.
> - *
> - * Contributions after 2012-01-13 are licensed under the terms of the
> - * GNU GPL, version 2 or (at your option) any later version.
>   */
>  #include <glusterfs/api/glfs.h>
>  #include "block/block_int.h"

I looked at git log -p block/gluster.c and this change seems reasonable,
but due to the nature of license changes:

If anyone disagrees and has copyright on part of this file, please speak
now.

Stefan

Re: [Qemu-devel] [RFC PATCH v0 1/2] gluster: Change licence to GPLv2+

[Bharata B Rao]

On Thu, Jan 30, 2014 at 10:30:53AM +0100, Stefan Hajnoczi wrote:
> On Wed, Jan 29, 2014 at 07:59:55PM +0530, Bharata B Rao wrote:
> > Pipe handling mechanism in gluster driver was based on similar implementation
> > in RBD driver and hence had GPLv2 and associated copyright information.
> > After changing gluster driver to coroutine based implementation, the pipe
> > handling code no longer exists and hence change gluster driver's licence to
> > GPLv2+ and remove RBD copyrights.
> > 
> > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
> > ---
> >  block/gluster.c | 12 ++----------
> >  1 file changed, 2 insertions(+), 10 deletions(-)
> > 
> > diff --git a/block/gluster.c b/block/gluster.c
> > index a009b15..ba56005 100644
> > --- a/block/gluster.c
> > +++ b/block/gluster.c
> > @@ -3,17 +3,9 @@
> >   *
> >   * Copyright (C) 2012 Bharata B Rao <bharata@linux.vnet.ibm.com>
> >   *
> > - * Pipe handling mechanism in AIO implementation is derived from
> > - * block/rbd.c. Hence,
> > + * This work is licensed under the terms of the GNU GPL, version 2 or later.
> > + * See the COPYING file in the top-level directory.
> >   *
> > - * Copyright (C) 2010-2011 Christian Brunner <chb@muc.de>,
> > - *                         Josh Durgin <josh.durgin@dreamhost.com>
> > - *
> > - * This work is licensed under the terms of the GNU GPL, version 2.  See
> > - * the COPYING file in the top-level directory.
> > - *
> > - * Contributions after 2012-01-13 are licensed under the terms of the
> > - * GNU GPL, version 2 or (at your option) any later version.
> >   */
> >  #include <glusterfs/api/glfs.h>
> >  #include "block/block_int.h"
> 
> I looked at git log -p block/gluster.c and this change seems reasonable,
> but due to the nature of license changes:
> 
> If anyone disagrees and has copyright on part of this file, please speak
> now.

Since nobody has said anything till now, Stefan, would you be taking this
in now ?

Regards,
Bharata.

[Qemu-devel] [RFC PATCH v0 2/2] gluster: Remove unused defines and header include

[Bharata B Rao]

Remove the definitions of GLUSTER_FD_WRITE and GLUSTER_FD_READ which are
no longer used. Also sockets.h isn't needed any more.

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
---
 block/gluster.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index ba56005..1838373 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -9,7 +9,6 @@
  */
 #include <glusterfs/api/glfs.h>
 #include "block/block_int.h"
-#include "qemu/sockets.h"
 #include "qemu/uri.h"
 
 typedef struct GlusterAIOCB {
@@ -24,9 +23,6 @@ typedef struct BDRVGlusterState {
     struct glfs_fd *fd;
 } BDRVGlusterState;
 
-#define GLUSTER_FD_READ  0
-#define GLUSTER_FD_WRITE 1
-
 typedef struct GlusterConf {
     char *server;
     int port;
-- 
1.7.11.7

Re: [Qemu-devel] [RFC PATCH v0 2/2] gluster: Remove unused defines and header include

[Stefan Hajnoczi]

On Wed, Jan 29, 2014 at 07:59:56PM +0530, Bharata B Rao wrote:
> Remove the definitions of GLUSTER_FD_WRITE and GLUSTER_FD_READ which are
> no longer used. Also sockets.h isn't needed any more.
> 
> Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
> ---
>  block/gluster.c | 4 ----
>  1 file changed, 4 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [Qemu-devel] [RFC PATCH v0 0/2] gluster: licence change and cleanups

[Stefan Hajnoczi]

On Wed, Jan 29, 2014 at 07:59:54PM +0530, Bharata B Rao wrote:
> Licence change of gluster driver from GPLv2 to GPLv2+ and some cleanups.
> 
> Bharata B Rao (2):
>   gluster: Change licence to GPLv2+
>   gluster: Remove unused defines and header include
> 
>  block/gluster.c | 16 ++--------------
>  1 file changed, 2 insertions(+), 14 deletions(-)

Hi Kevin,
I missed this series last week since it's tagged "RFC" but it's good to
go.

Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [Qemu-devel] [RFC PATCH v0 0/2] gluster: licence change and cleanups

[Kevin Wolf]

Am 03.03.2014 um 10:16 hat Stefan Hajnoczi geschrieben:
> On Wed, Jan 29, 2014 at 07:59:54PM +0530, Bharata B Rao wrote:
> > Licence change of gluster driver from GPLv2 to GPLv2+ and some cleanups.
> > 
> > Bharata B Rao (2):
> >   gluster: Change licence to GPLv2+
> >   gluster: Remove unused defines and header include
> > 
> >  block/gluster.c | 16 ++--------------
> >  1 file changed, 2 insertions(+), 14 deletions(-)
> 
> Hi Kevin,
> I missed this series last week since it's tagged "RFC" but it's good to
> go.
> 
> Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

Thanks, applied.

Kevin