Commit ac69e092 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 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2/3/4: delete unneeded includes of module.h
  ext{3,4}: Fix potential race when setversion ioctl updates inode
  udf: Mark LVID buffer as uptodate before marking it dirty
  ext3: Don't warn from writepage when readonly inode is spotted after error
  jbd: Remove j_barrier mutex
  reiserfs: Force inode evictions before umount to avoid crash
  reiserfs: Fix quota mount option parsing
  udf: Treat symlink component of type 2 as /
  udf: Fix deadlock when converting file from in-ICB one to normal one
  udf: Cleanup calling convention of inode_getblk()
  ext2: Fix error handling on inode bitmap corruption
  ext3: Fix error handling on inode bitmap corruption
  ext3: replace ll_rw_block with other functions
  ext3: NULL dereference in ext3_evict_inode()
  jbd: clear revoked flag on buffers before a new transaction started
  ext3: call ext3_mark_recovery_complete() when recovery is really needed
parents 9e203936 302bf2f3

fs/ext2/ialloc.c

+5 −2
Original line number Diff line number Diff line
@@ -573,8 +573,11 @@ got: 
	inode->i_generation = sbi->s_next_generation++;

	spin_unlock(&sbi->s_next_gen_lock);

	if (insert_inode_locked(inode) < 0) {

		err = -EINVAL;

		goto fail_drop;

		ext2_error(sb, "ext2_new_inode",

			   "inode number already in use - inode=%lu",

			   (unsigned long) ino);

		err = -EIO;

		goto fail;

	}



	dquot_initialize(inode);

fs/ext2/inode.c

+0 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/highuid.h>

#include <linux/pagemap.h>

#include <linux/quotaops.h>

#include <linux/module.h>

#include <linux/writeback.h>

#include <linux/buffer_head.h>

#include <linux/mpage.h>
@@ -36,10 +35,6 @@ 
#include "acl.h"

#include "xip.h"



MODULE_AUTHOR("Remy Card and others");

MODULE_DESCRIPTION("Second Extended Filesystem");

MODULE_LICENSE("GPL");



static int __ext2_write_inode(struct inode *inode, int do_sync);



/*

fs/ext2/super.c

+3 −0
Original line number Diff line number Diff line
@@ -1520,5 +1520,8 @@ static void __exit exit_ext2_fs(void) 
	exit_ext2_xattr();

}



MODULE_AUTHOR("Remy Card and others");

MODULE_DESCRIPTION("Second Extended Filesystem");

MODULE_LICENSE("GPL");

module_init(init_ext2_fs)

module_exit(exit_ext2_fs)

fs/ext2/xattr.c

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
 */



#include <linux/buffer_head.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/mbcache.h>

fs/ext2/xattr_security.c

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 * Handler for storing security labels as extended attributes.

 */



#include <linux/module.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/fs.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE