[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  ea96d79 replace: fix 520c9b0b0ae33
       via  0b57d1c quota: add supprt for gfs2
      from  6fb91dd RHEL packaging: Try to fix makerpms.sh on RHEL.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ea96d79e21a549204a7f64307059ea877bfb9fd5
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 18 14:04:06 2012 +0200

    replace: fix 520c9b0b0ae33
    
    fix typo in ifdef. Thanks to Joachim Schmitz for spotting this!
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Sep 18 16:06:18 CEST 2012 on sn-devel-104

commit 0b57d1c07520f4995412f224945324fef29f5989
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 18 13:57:30 2012 +0200

    quota: add supprt for gfs2
    
    gfs2 uses the same generic quota interface as xfs and it has the same base
    block/quota block size ratio and seems to work nice with the xfs quota module.
    
    (People using gfs should be aware that quota reporting is lagging quite a bit
    on gfs.  If you copy a file on a gfs volume the quota values are being updated
    with a delay of 30s here with kernel 3.5. This reporting can lead to data
    corruption if a client thinks he can write but actually he suddently can't.)

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/poll.c      |    2 +-
 source3/lib/sysquotas.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/poll.c b/lib/replace/poll.c
index 27876bb..1105617 100644
--- a/lib/replace/poll.c
+++ b/lib/replace/poll.c
@@ -33,7 +33,7 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_SYS_IOCTL
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 
diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index 97dd49d..2ef1d1b 100644
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -174,6 +174,8 @@ static struct {
 } sys_quota_backends[] = {
 #if defined HAVE_XFS_QUOTAS
 	{"xfs", sys_get_xfs_quota, 	sys_set_xfs_quota},
+	{"gfs", sys_get_xfs_quota, 	sys_set_xfs_quota},
+	{"gfs2", sys_get_xfs_quota, 	sys_set_xfs_quota},
 #endif /* HAVE_XFS_QUOTAS */
 #ifdef HAVE_NFS_QUOTAS
 	{"nfs", sys_get_nfs_quota,	sys_set_nfs_quota},


-- 
Samba Shared Repository