Attachment 12130 Details for Bug 11931 – git-am fix for 4.4.next and 4.3.next

[patch] git-am fix for 4.4.next and 4.3.next

bsd-quota-44.patch (text/plain), 1.16 KB, created by Uri Simchoni on 2016-05-24 17:20:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Simchoni

Created: 2016-05-24 17:20:59 UTC

Size: 1.16 KB

patch

obsolete

>From 1b86079c35dab8c4dc4496c7359e97ca46cf10e8 Mon Sep 17 00:00:00 2001
>From: Uri Simchoni <uri@samba.org>
>Date: Sat, 21 May 2016 22:25:32 +0300
>Subject: [PATCH] s3-quotas: fix sysquotas_4B quota fetching for BSD
>
>Correctly copy block hard/soft limits from the OS-specific structure
>to samba structure.
>
>BUG:https://bugzilla.samba.org/show_bug.cgi?id=11931
>
>Signed-off-by: Uri Simchoni <uri@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 59133295bbfd3b51953d9c86e3b533ff1d4861e3)
>---
> source3/lib/sysquotas_4B.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/source3/lib/sysquotas_4B.c b/source3/lib/sysquotas_4B.c
>index e3adc35..ee56432 100644
>--- a/source3/lib/sysquotas_4B.c
>+++ b/source3/lib/sysquotas_4B.c
>@@ -81,6 +81,12 @@ static void xlate_qblk_to_smb(const struct dqblk * const qblk,
> 	dp->hardlimit = XLATE_TO_BLOCKS(qblk->dqb_bhardlimit);
> 	dp->curblocks = XLATE_TO_BLOCKS(qblk->dqb_curbytes);
> #undef XLATE_TO_BLOCKS
>+#else
>+	dp->bsize = DEV_BSIZE;
>+
>+	dp->softlimit = qblk->dqb_bsoftlimit;
>+	dp->hardlimit = qblk->dqb_bhardlimit;
>+	dp->curblocks = qblk->dqb_curblocks;
> #endif
> 
> 	dp->ihardlimit = qblk->dqb_ihardlimit;
>-- 
>2.5.5
>

Flags:

jra: review+

Actions: View

Attachments on bug 11931: 12130