LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get
@ 2008-02-11 17:46 Roel Kluin
  2008-03-01  9:37 ` Adrian Bunk
  0 siblings, 1 reply; 6+ messages in thread
From: Roel Kluin @ 2008-02-11 17:46 UTC (permalink / raw)
  To: sfrench; +Cc: linux-cifs-client, samba-technical, lkml

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 <12o3l@tiscali.nl>
---
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,
 };

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get
  2008-02-11 17:46 [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get Roel Kluin
@ 2008-03-01  9:37 ` Adrian Bunk
  2008-03-01 16:06   ` Steve French
  0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2008-03-01  9:37 UTC (permalink / raw)
  To: Roel Kluin; +Cc: sfrench, linux-cifs-client, samba-technical, lkml

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 <12o3l@tiscali.nl>
> ---
> 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



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get
  2008-03-01  9:37 ` Adrian Bunk
@ 2008-03-01 16:06   ` Steve French
  2008-03-01 16:15     ` Adrian Bunk
  0 siblings, 1 reply; 6+ messages in thread
From: Steve French @ 2008-03-01 16:06 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Roel Kluin, sfrench, linux-cifs-client, samba-technical, lkml

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 <bunk@kernel.org> 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 <12o3l@tiscali.nl>
>  > ---
>  > 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get
  2008-03-01 16:06   ` Steve French
@ 2008-03-01 16:15     ` Adrian Bunk
  2008-03-01 18:29       ` Steve French
  0 siblings, 1 reply; 6+ messages in thread
From: Adrian Bunk @ 2008-03-01 16:15 UTC (permalink / raw)
  To: Steve French
  Cc: Roel Kluin, sfrench, linux-cifs-client, samba-technical, lkml

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get
  2008-03-01 16:15     ` Adrian Bunk
@ 2008-03-01 18:29       ` Steve French
  2008-03-01 18:40         ` Steve French
  0 siblings, 1 reply; 6+ messages in thread
From: Steve French @ 2008-03-01 18:29 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Roel Kluin, sfrench, linux-cifs-client, samba-technical, lkml

On Sat, Mar 1, 2008 at 10:15 AM, Adrian Bunk <bunk@kernel.org> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get
  2008-03-01 18:29       ` Steve French
@ 2008-03-01 18:40         ` Steve French
  0 siblings, 0 replies; 6+ messages in thread
From: Steve French @ 2008-03-01 18:40 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Roel Kluin, sfrench, linux-cifs-client, samba-technical, lkml

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 <smfrench@gmail.com> wrote:
> On Sat, Mar 1, 2008 at 10:15 AM, Adrian Bunk <bunk@kernel.org> 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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-03-01 18:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-11 17:46 [PATCH][fs/cifs/cifsfs.c] Make use of cifs_xquota_get Roel Kluin
2008-03-01  9:37 ` Adrian Bunk
2008-03-01 16:06   ` Steve French
2008-03-01 16:15     ` Adrian Bunk
2008-03-01 18:29       ` Steve French
2008-03-01 18:40         ` Steve French

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).