projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
[deliverable/linux.git]
/
fs
/
quota
/
quota.c
diff --git
a/fs/quota/quota.c
b/fs/quota/quota.c
index 0ebc90496525d13684ed96402cab612b0c2da356..0f10ee9892ce3a371b5341ebc4f1db2bd5a74a8a 100644
(file)
--- a/
fs/quota/quota.c
+++ b/
fs/quota/quota.c
@@
-224,7
+224,7
@@
static int quota_getquota(struct super_block *sb, int type, qid_t id,
/*
* Return quota for next active quota >= this id, if any exists,
/*
* Return quota for next active quota >= this id, if any exists,
- * otherwise return -E
SRCH
via ->get_nextdqblk
+ * otherwise return -E
NOENT
via ->get_nextdqblk
*/
static int quota_getnextquota(struct super_block *sb, int type, qid_t id,
void __user *addr)
*/
static int quota_getnextquota(struct super_block *sb, int type, qid_t id,
void __user *addr)
@@
-655,7
+655,7
@@
static int quota_getxquota(struct super_block *sb, int type, qid_t id,
/*
* Return quota for next active quota >= this id, if any exists,
/*
* Return quota for next active quota >= this id, if any exists,
- * otherwise return -E
SRCH
via ->get_nextdqblk.
+ * otherwise return -E
NOENT
via ->get_nextdqblk.
*/
static int quota_getnextxquota(struct super_block *sb, int type, qid_t id,
void __user *addr)
*/
static int quota_getnextxquota(struct super_block *sb, int type, qid_t id,
void __user *addr)
@@
-765,10
+765,14
@@
static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
/* Return 1 if 'cmd' will block on frozen filesystem */
static int quotactl_cmd_write(int cmd)
{
/* Return 1 if 'cmd' will block on frozen filesystem */
static int quotactl_cmd_write(int cmd)
{
+ /*
+ * We cannot allow Q_GETQUOTA and Q_GETNEXTQUOTA without write access
+ * as dquot_acquire() may allocate space for new structure and OCFS2
+ * needs to increment on-disk use count.
+ */
switch (cmd) {
case Q_GETFMT:
case Q_GETINFO:
switch (cmd) {
case Q_GETFMT:
case Q_GETINFO:
- case Q_GETNEXTQUOTA:
case Q_SYNC:
case Q_XGETQSTAT:
case Q_XGETQSTATV:
case Q_SYNC:
case Q_XGETQSTAT:
case Q_XGETQSTATV:
This page took
0.028272 seconds
and
5
git commands to generate.