Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[karo-tx-linux.git] / fs / ocfs2 / quota_global.c

diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index 7eadf8bf1e1f458177e58da29231bc20c3d41ccb..b437dc0c4caddd814c824822ff93aa48d26afd65 100644 (file)
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -154,7 +154,7 @@ static int ocfs2_get_quota_block(struct inode *inode, int block,
                err = -EIO;
                mlog_errno(err);
        }
-       return err;;
+       return err;
 }
 
 /* Read data from global quotafile - avoid pagecache and such because we cannot
@@ -850,7 +850,7 @@ static void ocfs2_destroy_dquot(struct dquot *dquot)
        kmem_cache_free(ocfs2_dquot_cachep, dquot);
 }
 
-struct dquot_operations ocfs2_quota_operations = {
+const struct dquot_operations ocfs2_quota_operations = {
        .initialize     = dquot_initialize,
        .drop           = dquot_drop,
        .alloc_space    = dquot_alloc_space,