Commit a7963eb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull ext3 improvements, cleanups, reiserfs fix from Jan Kara:
 "various cleanups for ext2, ext3, udf, isofs, a documentation update
  for quota, and a fix of a race in reiserfs readdir implementation"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: fix race in readdir
  ext2: acl: remove unneeded include of linux/capability.h
  ext3: explicitly remove inode from orphan list after failed direct io
  fs/isofs/inode.c add __init to init_inodecache()
  ext3: Speedup WB_SYNC_ALL pass
  fs/quota/Kconfig: Update filesystems
  ext3: Update outdated comment before ext3_ordered_writepage()
  ext3: Update PF_MEMALLOC handling in ext3_write_inode()
  ext2/3: use prandom_u32() instead of get_random_bytes()
  ext3: remove an unneeded check in ext3_new_blocks()
  ext3: remove unneeded check in ext3_ordered_writepage()
  fs: Mark function as static in ext3/xattr_security.c
  fs: Mark function as static in ext3/dir.c
  fs: Mark function as static in ext2/xattr_security.c
  ext3: Add __init macro to init_inodecache
  ext2: Add __init macro to init_inodecache
  udf: Add __init macro to init_inodecache
  fs: udf: parse_options: blocksize check
parents b003d770 01d88857

fs/ext2/acl.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 
 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de>

 * Copyright (C) 2001-2003 Andreas Gruenbacher, <agruen@suse.de>

 */

 */





#include <linux/capability.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/slab.h>

fs/ext2/ialloc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -284,7 +284,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent) 
		int best_ndir = inodes_per_group;

		int best_ndir = inodes_per_group;

		int best_group = -1;

		int best_group = -1;





		get_random_bytes(&group, sizeof(group));

		group = prandom_u32();

		parent_group = (unsigned)group % ngroups;

		parent_group = (unsigned)group % ngroups;

		for (i = 0; i < ngroups; i++) {

		for (i = 0; i < ngroups; i++) {

			group = (parent_group + i) % ngroups;

			group = (parent_group + i) % ngroups;

fs/ext2/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -192,7 +192,7 @@ static void init_once(void *foo) 
	inode_init_once(&ei->vfs_inode);

	inode_init_once(&ei->vfs_inode);

}

}





static int init_inodecache(void)

static int __init init_inodecache(void)

{

{

	ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",

	ext2_inode_cachep = kmem_cache_create("ext2_inode_cache",

					     sizeof(struct ext2_inode_info),

					     sizeof(struct ext2_inode_info),

fs/ext2/xattr_security.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ ext2_xattr_security_set(struct dentry *dentry, const char *name, 
			      value, size, flags);

			      value, size, flags);

}

}





int ext2_initxattrs(struct inode *inode, const struct xattr *xattr_array,

static int ext2_initxattrs(struct inode *inode, const struct xattr *xattr_array,

			   void *fs_info)

			   void *fs_info)

{

{

	const struct xattr *xattr;

	const struct xattr *xattr;

fs/ext3/balloc.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1727,10 +1727,7 @@ allocated: 
	percpu_counter_sub(&sbi->s_freeblocks_counter, num);

	percpu_counter_sub(&sbi->s_freeblocks_counter, num);





	BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor");

	BUFFER_TRACE(gdp_bh, "journal_dirty_metadata for group descriptor");

	err = ext3_journal_dirty_metadata(handle, gdp_bh);

	fatal = ext3_journal_dirty_metadata(handle, gdp_bh);

	if (!fatal)

		fatal = err;



	if (fatal)

	if (fatal)

		goto out;

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE