X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fext4%2Fsuper.c;h=1e69f29a8c5582ba209ad7dbeb49e57396d7e2fe;hb=676056132425ac425d7215cdaa8bd25582e07966;hp=1cb371dcd609aae5f115cf236acd4d0c66956efb;hpb=77e442461c74068217b59b356cf18992c78ed896;p=linux-2.6 diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 1cb371dcd6..1e69f29a8c 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -595,7 +595,7 @@ static void ext4_destroy_inode(struct inode *inode) kmem_cache_free(ext4_inode_cachep, EXT4_I(inode)); } -static void init_once(struct kmem_cache *cachep, void *foo) +static void init_once(void *foo) { struct ext4_inode_info *ei = (struct ext4_inode_info *) foo; @@ -3352,8 +3352,9 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id, jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal); } + err = vfs_quota_on_path(sb, type, format_id, &nd.path); path_put(&nd.path); - return vfs_quota_on(sb, type, format_id, path, remount); + return err; } /* Read data from quotafile - avoid pagecache and such because we cannot afford