git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' into next
[pandora-kernel.git]
/
fs
/
quota.c
diff --git
a/fs/quota.c
b/fs/quota.c
index
84f28dd
..
db1cc9f
100644
(file)
--- a/
fs/quota.c
+++ b/
fs/quota.c
@@
-69,7
+69,6
@@
static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid
switch (cmd) {
case Q_GETFMT:
case Q_GETINFO:
switch (cmd) {
case Q_GETFMT:
case Q_GETINFO:
- case Q_QUOTAOFF:
case Q_SETINFO:
case Q_SETQUOTA:
case Q_GETQUOTA:
case Q_SETINFO:
case Q_SETQUOTA:
case Q_GETQUOTA:
@@
-229,12
+228,12
@@
static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id, void
if (IS_ERR(pathname = getname(addr)))
return PTR_ERR(pathname);
if (IS_ERR(pathname = getname(addr)))
return PTR_ERR(pathname);
- ret = sb->s_qcop->quota_on(sb, type, id, pathname);
+ ret = sb->s_qcop->quota_on(sb, type, id, pathname
, 0
);
putname(pathname);
return ret;
}
case Q_QUOTAOFF:
putname(pathname);
return ret;
}
case Q_QUOTAOFF:
- return sb->s_qcop->quota_off(sb, type);
+ return sb->s_qcop->quota_off(sb, type
, 0
);
case Q_GETFMT: {
__u32 fmt;
case Q_GETFMT: {
__u32 fmt;