sugar/linux
1
0
Fork 0
Code Activity

Merge udf, isofs, quota, ext2 changes for 4.15-rc1.

Browse Source
This commit is contained in:
Jan Kara
2017-11-14 11:09:53 +01:00
parent ac3d79392f 88d8ff976a
commit 838bee9e75
27 changed files with 366 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/quota/dquot.c
View File

@@ -644,8 +644,15 @@ int dquot_writeback_dquots(struct super_block *sb, int type)
spin_unlock(&dq_list_lock);
dqstats_inc(DQST_LOOKUPS);
err = sb->dq_op->write_dquot(dquot);
if (!ret && err)
ret = err;
if (err) {
/*
* Clear dirty bit anyway to avoid infinite
* loop here.
*/
clear_dquot_dirty(dquot);
if (!ret)
ret = err;
}
dqput(dquot);
spin_lock(&dq_list_lock);
}
@@ -2138,7 +2145,7 @@ int dquot_file_open(struct inode *inode, struct file *file)
error = generic_file_open(inode, file);
if (!error && (file->f_mode & FMODE_WRITE))
dquot_initialize(inode);
error = dquot_initialize(inode);
return error;
}
EXPORT_SYMBOL(dquot_file_open);