diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:51:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:51:21 -0500 |
commit | ac69e0928054ff29a5049902fb477f9c7605c773 (patch) | |
tree | 05be6b9285186823452e0adeffe40e1dfee6e354 /fs/ext2 | |
parent | 9e203936eac786f9268d6a13e6442d2accef1829 (diff) | |
parent | 302bf2f3259948c93361d501b04a5ed69c3bd4f8 (diff) |
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
Diffstat (limited to 'fs/ext2')
-rw-r--r-- | fs/ext2/ialloc.c | 7 | ||||
-rw-r--r-- | fs/ext2/inode.c | 5 | ||||
-rw-r--r-- | fs/ext2/super.c | 3 | ||||
-rw-r--r-- | fs/ext2/xattr.c | 1 | ||||
-rw-r--r-- | fs/ext2/xattr_security.c | 1 | ||||
-rw-r--r-- | fs/ext2/xattr_trusted.c | 1 | ||||
-rw-r--r-- | fs/ext2/xattr_user.c | 1 |
7 files changed, 8 insertions, 11 deletions
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index cd7f5f424a75..8b15cf8cef37 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c | |||
@@ -573,8 +573,11 @@ got: | |||
573 | inode->i_generation = sbi->s_next_generation++; | 573 | inode->i_generation = sbi->s_next_generation++; |
574 | spin_unlock(&sbi->s_next_gen_lock); | 574 | spin_unlock(&sbi->s_next_gen_lock); |
575 | if (insert_inode_locked(inode) < 0) { | 575 | if (insert_inode_locked(inode) < 0) { |
576 | err = -EINVAL; | 576 | ext2_error(sb, "ext2_new_inode", |
577 | goto fail_drop; | 577 | "inode number already in use - inode=%lu", |
578 | (unsigned long) ino); | ||
579 | err = -EIO; | ||
580 | goto fail; | ||
578 | } | 581 | } |
579 | 582 | ||
580 | dquot_initialize(inode); | 583 | dquot_initialize(inode); |
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 91a6945af6d8..740cad8dcd8d 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/highuid.h> | 26 | #include <linux/highuid.h> |
27 | #include <linux/pagemap.h> | 27 | #include <linux/pagemap.h> |
28 | #include <linux/quotaops.h> | 28 | #include <linux/quotaops.h> |
29 | #include <linux/module.h> | ||
30 | #include <linux/writeback.h> | 29 | #include <linux/writeback.h> |
31 | #include <linux/buffer_head.h> | 30 | #include <linux/buffer_head.h> |
32 | #include <linux/mpage.h> | 31 | #include <linux/mpage.h> |
@@ -36,10 +35,6 @@ | |||
36 | #include "acl.h" | 35 | #include "acl.h" |
37 | #include "xip.h" | 36 | #include "xip.h" |
38 | 37 | ||
39 | MODULE_AUTHOR("Remy Card and others"); | ||
40 | MODULE_DESCRIPTION("Second Extended Filesystem"); | ||
41 | MODULE_LICENSE("GPL"); | ||
42 | |||
43 | static int __ext2_write_inode(struct inode *inode, int do_sync); | 38 | static int __ext2_write_inode(struct inode *inode, int do_sync); |
44 | 39 | ||
45 | /* | 40 | /* |
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 9b403f064ce0..0090595beb28 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -1520,5 +1520,8 @@ static void __exit exit_ext2_fs(void) | |||
1520 | exit_ext2_xattr(); | 1520 | exit_ext2_xattr(); |
1521 | } | 1521 | } |
1522 | 1522 | ||
1523 | MODULE_AUTHOR("Remy Card and others"); | ||
1524 | MODULE_DESCRIPTION("Second Extended Filesystem"); | ||
1525 | MODULE_LICENSE("GPL"); | ||
1523 | module_init(init_ext2_fs) | 1526 | module_init(init_ext2_fs) |
1524 | module_exit(exit_ext2_fs) | 1527 | module_exit(exit_ext2_fs) |
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index d27b71f1d183..6dcafc7efdfd 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c | |||
@@ -54,7 +54,6 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <linux/buffer_head.h> | 56 | #include <linux/buffer_head.h> |
57 | #include <linux/module.h> | ||
58 | #include <linux/init.h> | 57 | #include <linux/init.h> |
59 | #include <linux/slab.h> | 58 | #include <linux/slab.h> |
60 | #include <linux/mbcache.h> | 59 | #include <linux/mbcache.h> |
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c index c922adc8ef41..be7a8d02c9a7 100644 --- a/fs/ext2/xattr_security.c +++ b/fs/ext2/xattr_security.c | |||
@@ -3,7 +3,6 @@ | |||
3 | * Handler for storing security labels as extended attributes. | 3 | * Handler for storing security labels as extended attributes. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/module.h> | ||
7 | #include <linux/slab.h> | 6 | #include <linux/slab.h> |
8 | #include <linux/string.h> | 7 | #include <linux/string.h> |
9 | #include <linux/fs.h> | 8 | #include <linux/fs.h> |
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c index 667e46a8d62d..2989467d3595 100644 --- a/fs/ext2/xattr_trusted.c +++ b/fs/ext2/xattr_trusted.c | |||
@@ -5,7 +5,6 @@ | |||
5 | * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org> | 5 | * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org> |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/module.h> | ||
9 | #include <linux/string.h> | 8 | #include <linux/string.h> |
10 | #include <linux/capability.h> | 9 | #include <linux/capability.h> |
11 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c index 099d20f47163..f470e44c4b8d 100644 --- a/fs/ext2/xattr_user.c +++ b/fs/ext2/xattr_user.c | |||
@@ -6,7 +6,6 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | #include <linux/module.h> | ||
10 | #include <linux/string.h> | 9 | #include <linux/string.h> |
11 | #include "ext2.h" | 10 | #include "ext2.h" |
12 | #include "xattr.h" | 11 | #include "xattr.h" |