[PATCH 4.14 092/156] quota: propagate error from __dquot_initialize

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Chao Yu 


[ Upstream commit 1a6152d36dee08da2be2a3030dceb45ef680460a ]

In commit 6184fc0b8dd7 ("quota: Propagate error from ->acquire_dquot()"),
we have propagated error from __dquot_initialize to caller, but we forgot
to handle such error in add_dquot_ref(), so, currently, during quota
accounting information initialization flow, if we failed for some of
inodes, we just ignore such error, and do account for others, which is
not a good implementation.

In this patch, we choose to let user be aware of such error, so after
turning on quota successfully, we can make sure all inodes disk usage
can be accounted, which will be more reasonable.

Suggested-by: Jan Kara 
Signed-off-by: Chao Yu 
Signed-off-by: Jan Kara 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 fs/quota/dquot.c |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -934,12 +934,13 @@ static int dqinit_needed(struct inode *i
 }
 
 /* This routine is guarded by s_umount semaphore */
-static void add_dquot_ref(struct super_block *sb, int type)
+static int add_dquot_ref(struct super_block *sb, int type)
 {
struct inode *inode, *old_inode = NULL;
 #ifdef CONFIG_QUOTA_DEBUG
int reserved = 0;
 #endif
+   int err = 0;
 
spin_lock(>s_inode_list_lock);
list_for_each_entry(inode, >s_inodes, i_sb_list) {
@@ -959,7 +960,11 @@ static void add_dquot_ref(struct super_b
reserved = 1;
 #endif
iput(old_inode);
-   __dquot_initialize(inode, type);
+   err = __dquot_initialize(inode, type);
+   if (err) {
+   iput(inode);
+   goto out;
+   }
 
/*
 * We hold a reference to 'inode' so it couldn't have been
@@ -974,7 +979,7 @@ static void add_dquot_ref(struct super_b
}
spin_unlock(>s_inode_list_lock);
iput(old_inode);
-
+out:
 #ifdef CONFIG_QUOTA_DEBUG
if (reserved) {
quota_error(sb, "Writes happened before quota was turned on "
@@ -982,6 +987,7 @@ static void add_dquot_ref(struct super_b
"Please run quotacheck(8)");
}
 #endif
+   return err;
 }
 
 /*
@@ -2372,10 +2378,11 @@ static int vfs_load_quota_inode(struct i
dqopt->flags |= dquot_state_flag(flags, type);
spin_unlock(_state_lock);
 
-   add_dquot_ref(sb, type);
-
-   return 0;
+   error = add_dquot_ref(sb, type);
+   if (error)
+   dquot_disable(sb, type, flags);
 
+   return error;
 out_file_init:
dqopt->files[type] = NULL;
iput(inode);

[PATCH 4.14 092/156] quota: propagate error from __dquot_initialize

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Chao Yu 


[ Upstream commit 1a6152d36dee08da2be2a3030dceb45ef680460a ]

In commit 6184fc0b8dd7 ("quota: Propagate error from ->acquire_dquot()"),
we have propagated error from __dquot_initialize to caller, but we forgot
to handle such error in add_dquot_ref(), so, currently, during quota
accounting information initialization flow, if we failed for some of
inodes, we just ignore such error, and do account for others, which is
not a good implementation.

In this patch, we choose to let user be aware of such error, so after
turning on quota successfully, we can make sure all inodes disk usage
can be accounted, which will be more reasonable.

Suggested-by: Jan Kara 
Signed-off-by: Chao Yu 
Signed-off-by: Jan Kara 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 fs/quota/dquot.c |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -934,12 +934,13 @@ static int dqinit_needed(struct inode *i
 }
 
 /* This routine is guarded by s_umount semaphore */
-static void add_dquot_ref(struct super_block *sb, int type)
+static int add_dquot_ref(struct super_block *sb, int type)
 {
struct inode *inode, *old_inode = NULL;
 #ifdef CONFIG_QUOTA_DEBUG
int reserved = 0;
 #endif
+   int err = 0;
 
spin_lock(>s_inode_list_lock);
list_for_each_entry(inode, >s_inodes, i_sb_list) {
@@ -959,7 +960,11 @@ static void add_dquot_ref(struct super_b
reserved = 1;
 #endif
iput(old_inode);
-   __dquot_initialize(inode, type);
+   err = __dquot_initialize(inode, type);
+   if (err) {
+   iput(inode);
+   goto out;
+   }
 
/*
 * We hold a reference to 'inode' so it couldn't have been
@@ -974,7 +979,7 @@ static void add_dquot_ref(struct super_b
}
spin_unlock(>s_inode_list_lock);
iput(old_inode);
-
+out:
 #ifdef CONFIG_QUOTA_DEBUG
if (reserved) {
quota_error(sb, "Writes happened before quota was turned on "
@@ -982,6 +987,7 @@ static void add_dquot_ref(struct super_b
"Please run quotacheck(8)");
}
 #endif
+   return err;
 }
 
 /*
@@ -2372,10 +2378,11 @@ static int vfs_load_quota_inode(struct i
dqopt->flags |= dquot_state_flag(flags, type);
spin_unlock(_state_lock);
 
-   add_dquot_ref(sb, type);
-
-   return 0;
+   error = add_dquot_ref(sb, type);
+   if (error)
+   dquot_disable(sb, type, flags);
 
+   return error;
 out_file_init:
dqopt->files[type] = NULL;
iput(inode);