These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ocfs2 / quota_local.c

diff --git a/kernel/fs/ocfs2/quota_local.c b/kernel/fs/ocfs2/quota_local.c
index 3d0b63d..8a54fd8 100644 (file)
--- a/kernel/fs/ocfs2/quota_local.c
+++ b/kernel/fs/ocfs2/quota_local.c
@@ -138,8 +138,7 @@ static int ocfs2_read_quota_block(struct inode *inode, u64 v_block,
 
        if (i_size_read(inode) >> inode->i_sb->s_blocksize_bits <= v_block) {
                ocfs2_error(inode->i_sb,
-                           "Quota file %llu is probably corrupted! Requested "
-                           "to read block %Lu but file has size only %Lu\n",
+                           "Quota file %llu is probably corrupted! Requested to read block %Lu but file has size only %Lu\n",
                            (unsigned long long)OCFS2_I(inode)->ip_blkno,
                            (unsigned long long)v_block,
                            (unsigned long long)i_size_read(inode));
@@ -499,8 +498,8 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode,
                        dquot = dqget(sb,
                                      make_kqid(&init_user_ns, type,
                                                le64_to_cpu(dqblk->dqb_id)));
-                       if (!dquot) {
-                               status = -EIO;
+                       if (IS_ERR(dquot)) {
+                               status = PTR_ERR(dquot);
                                mlog(ML_ERROR, "Failed to get quota structure "
                                     "for id %u, type %d. Cannot finish quota "
                                     "file recovery.\n",