Skip to contentSkip to conversation

Make use of cifs_xquota_get

PATCH In review Roel Kluin 3 participants 6 messages Feb 11, 2008 – Mar 1, 2008

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 Make use of cifs_xquota_get

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

---

fs/cifs/cifsfs.c +1 -1
index fcc4342..339b829 100644
@@ -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,
 };
#1 lore raw
Quoted 21 lines · Roel Kluin

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

---

fs/cifs/cifsfs.c +0 -0
index fcc4342..339b829 100644

fs/cifs/cifsfs.c int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats) · line 467

Quoted 8 lines
fs/cifs/cifsfs.c +1 -1
@@ -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

Signature · 4 lines
       "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
#2 lore raw

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)

Quoted 48 lines · Adrian Bunk
Quoted 21 lines · Roel Kluin

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

---

fs/cifs/cifsfs.c +0 -0
index fcc4342..339b829 100644

fs/cifs/cifsfs.c int cifs_xstate_get(struct super_block *sb, struct fs_quota_stat *qstats) · line 467

Quoted 8 lines
fs/cifs/cifsfs.c +1 -1
@@ -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

Signature · 3 lines
Thanks,

Steve
#3 lore raw
Quoted 4 lines · Steve French

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.

Quoted 3 lines

Thanks,

Steve

cu
Adrian

Signature · 4 lines
       "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
#4 lore raw
Quoted 5 lines · Adrian Bunk
Quoted 4 lines · Steve French

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.

Quoted 21 lines

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.

Quoted 3 lines

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

Signature · 3 lines
Thanks,

Steve
#5 lore raw

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?

Quoted 41 lines · Steve French
Quoted 5 lines · Adrian Bunk
Quoted 4 lines · Steve French

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.

Quoted 11 lines

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.

Quoted 3 lines

Thanks,

Steve

cu

Quoted 10 lines

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

Signature · 3 lines
Thanks,

Steve