Functions cifs_xquota_set and cifs_xquota_get at respectively
fs/cifs/cifsfs.c:367 and 392 are entirely similar - except for
whitespace
struct quotactl_ops contains function pointers .set_xquota and
.get_xquota that both get the address of cifs_xquota_set.
cifs_xquota_get isn't called anywhere else in the kernel.
The patch below makes use of the function cifs_xquota_get, As
an alternative the entire function cifs_xquota_get could be
removed.
---
Make use of cifs_xquota_get
Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index fcc4342..339b829 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -461,7 +461,7 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats)
static struct quotactl_ops cifs_quotactl_ops = {
.set_xquota = cifs_xquota_set,
- .get_xquota = cifs_xquota_set,
+ .get_xquota = cifs_xquota_get,
.set_xstate = cifs_xstate_set,
.get_xstate = cifs_xstate_get,
};
On Mon, Feb 11, 2008 at 06:46:51PM +0100, Roel Kluin wrote:
> Functions cifs_xquota_set and cifs_xquota_get at respectively
> fs/cifs/cifsfs.c:367 and 392 are entirely similar - except for
> whitespace
>
> struct quotactl_ops contains function pointers .set_xquota and
> .get_xquota that both get the address of cifs_xquota_set.
> cifs_xquota_get isn't called anywhere else in the kernel.
>
> The patch below makes use of the function cifs_xquota_get, As
> an alternative the entire function cifs_xquota_get could be
> removed.
> ---
> Make use of cifs_xquota_get
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index fcc4342..339b829 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -461,7 +461,7 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats)
>
> static struct quotactl_ops cifs_quotactl_ops = {
> .set_xquota = cifs_xquota_set,
> - .get_xquota = cifs_xquota_set,
> + .get_xquota = cifs_xquota_get,
> .set_xstate = cifs_xstate_set,
> .get_xstate = cifs_xstate_get,
> };
Steve, this obvious bugfix seems to be stuck in cifs-2.6.git.
Can you forward this fix (and other fixes if you have any) to Linus soon?
TIA
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
There are quite a few fixes stuck in cifs-2.6.git that are fine to be
merged with mainline but didn't want to bug Linus with multiple merge
requests (there are a couple of more fixes that are not in
cifs-2.6.git pending review)
On Sat, Mar 1, 2008 at 3:37 AM, Adrian Bunk <[email protected]> wrote:
>
> On Mon, Feb 11, 2008 at 06:46:51PM +0100, Roel Kluin wrote:
> > Functions cifs_xquota_set and cifs_xquota_get at respectively
> > fs/cifs/cifsfs.c:367 and 392 are entirely similar - except for
> > whitespace
> >
> > struct quotactl_ops contains function pointers .set_xquota and
> > .get_xquota that both get the address of cifs_xquota_set.
> > cifs_xquota_get isn't called anywhere else in the kernel.
> >
> > The patch below makes use of the function cifs_xquota_get, As
> > an alternative the entire function cifs_xquota_get could be
> > removed.
> > ---
> > Make use of cifs_xquota_get
> >
> > Signed-off-by: Roel Kluin <[email protected]>
> > ---
> > diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> > index fcc4342..339b829 100644
> > --- a/fs/cifs/cifsfs.c
> > +++ b/fs/cifs/cifsfs.c
> > @@ -461,7 +461,7 @@ int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats)
> >
> > static struct quotactl_ops cifs_quotactl_ops = {
> > .set_xquota = cifs_xquota_set,
> > - .get_xquota = cifs_xquota_set,
> > + .get_xquota = cifs_xquota_get,
> > .set_xstate = cifs_xstate_set,
> > .get_xstate = cifs_xstate_get,
> > };
>
> Steve, this obvious bugfix seems to be stuck in cifs-2.6.git.
>
> Can you forward this fix (and other fixes if you have any) to Linus soon?
>
> TIA
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
>
>
--
Thanks,
Steve
On Sat, Mar 01, 2008 at 10:06:11AM -0600, Steve French wrote:
> There are quite a few fixes stuck in cifs-2.6.git that are fine to be
> merged with mainline but didn't want to bug Linus with multiple merge
> requests (there are a couple of more fixes that are not in
> cifs-2.6.git pending review)
I just realize that this specific bug is in code that is not (yet?)
available for users at all, so my email was a bit bogus.
But generally please try to get fixes to Linus early - and having a few
more weeks for getting fixes tested is more important than how often
Linus pulls from you.
> Thanks,
>
> Steve
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
On Sat, Mar 1, 2008 at 10:15 AM, Adrian Bunk <[email protected]> wrote:
> On Sat, Mar 01, 2008 at 10:06:11AM -0600, Steve French wrote:
> > There are quite a few fixes stuck in cifs-2.6.git that are fine to be
> > merged with mainline but didn't want to bug Linus with multiple merge
> > requests (there are a couple of more fixes that are not in
> > cifs-2.6.git pending review)
Just tried to check my cifs-2.6 tree on kernel.org and forward the merge
request off to Linus but it looks like the mainline tree has been rebuilt
(git diff shows "warning: no common commits"). Am syncing again.
> But generally please try to get fixes to Linus early - and having a few
> more weeks for getting fixes tested is more important than how often
> Linus pulls from you.
>
> > Thanks,
> >
> > Steve
>
> cu
>
>
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
>
--
Thanks,
Steve
Without changing my tree - cg-diff against mainline now shows
5525 files changed, 291635 insertions(+), 134707 deletions(-)
where last time I checked about a week ago it showed only a few
hundred lines changed.
Any idea what happened to mainline git tree?
On Sat, Mar 1, 2008 at 12:29 PM, Steve French <[email protected]> wrote:
> On Sat, Mar 1, 2008 at 10:15 AM, Adrian Bunk <[email protected]> wrote:
> > On Sat, Mar 01, 2008 at 10:06:11AM -0600, Steve French wrote:
> > > There are quite a few fixes stuck in cifs-2.6.git that are fine to be
> > > merged with mainline but didn't want to bug Linus with multiple merge
> > > requests (there are a couple of more fixes that are not in
> > > cifs-2.6.git pending review)
> Just tried to check my cifs-2.6 tree on kernel.org and forward the merge
> request off to Linus but it looks like the mainline tree has been rebuilt
> (git diff shows "warning: no common commits"). Am syncing again.
>
>
>
> > But generally please try to get fixes to Linus early - and having a few
> > more weeks for getting fixes tested is more important than how often
> > Linus pulls from you.
> >
> > > Thanks,
> > >
> > > Steve
> >
> > cu
> >
> >
> > Adrian
> >
> > --
> >
> > "Is there not promise of rain?" Ling Tan asked suddenly out
> > of the darkness. There had been need of rain for many days.
> > "Only a promise," Lao Er said.
> > Pearl S. Buck - Dragon Seed
> >
> >
>
>
>
> --
> Thanks,
>
> Steve
>
--
Thanks,
Steve