aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Czerner <lczerner@redhat.com>2014-05-12 12:55:07 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-05-12 12:55:07 -0400
commitc8b459f492cbe8be26d8eac0489ef627ed355947 (patch)
treeb8796e01968b36a0eb607cc08839a8fe921b7dcd
parent029b10c5a8d9e9db528eea66f5728ccca56c2f27 (diff)
ext4: remove unnecessary double parentheses
Signed-off-by: Lukas Czerner <lczerner@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/extents.c6
-rw-r--r--fs/ext4/inode.c10
-rw-r--r--fs/ext4/migrate.c2
-rw-r--r--fs/ext4/super.c2
-rw-r--r--fs/ext4/xattr.c2
5 files changed, 11 insertions, 11 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index e305a31641f2..662e94c22c3d 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4018,7 +4018,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
4018 allocated, newblock); 4018 allocated, newblock);
4019 4019
4020 /* get_block() before submit the IO, split the extent */ 4020 /* get_block() before submit the IO, split the extent */
4021 if ((flags & EXT4_GET_BLOCKS_PRE_IO)) { 4021 if (flags & EXT4_GET_BLOCKS_PRE_IO) {
4022 ret = ext4_split_convert_extents(handle, inode, map, 4022 ret = ext4_split_convert_extents(handle, inode, map,
4023 path, flags | EXT4_GET_BLOCKS_CONVERT); 4023 path, flags | EXT4_GET_BLOCKS_CONVERT);
4024 if (ret <= 0) 4024 if (ret <= 0)
@@ -4036,7 +4036,7 @@ ext4_ext_handle_unwritten_extents(handle_t *handle, struct inode *inode,
4036 goto out; 4036 goto out;
4037 } 4037 }
4038 /* IO end_io complete, convert the filled extent to written */ 4038 /* IO end_io complete, convert the filled extent to written */
4039 if ((flags & EXT4_GET_BLOCKS_CONVERT)) { 4039 if (flags & EXT4_GET_BLOCKS_CONVERT) {
4040 ret = ext4_convert_unwritten_extents_endio(handle, inode, map, 4040 ret = ext4_convert_unwritten_extents_endio(handle, inode, map,
4041 path); 4041 path);
4042 if (ret >= 0) { 4042 if (ret >= 0) {
@@ -4475,7 +4475,7 @@ got_allocated_blocks:
4475 * For non asycn direct IO case, flag the inode state 4475 * For non asycn direct IO case, flag the inode state
4476 * that we need to perform conversion when IO is done. 4476 * that we need to perform conversion when IO is done.
4477 */ 4477 */
4478 if ((flags & EXT4_GET_BLOCKS_PRE_IO)) 4478 if (flags & EXT4_GET_BLOCKS_PRE_IO)
4479 set_unwritten = 1; 4479 set_unwritten = 1;
4480 } 4480 }
4481 4481
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 574c6dda95d8..2bdbfcb48732 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -443,7 +443,7 @@ static void ext4_map_blocks_es_recheck(handle_t *handle,
443 * could be converted. 443 * could be converted.
444 */ 444 */
445 if (!(flags & EXT4_GET_BLOCKS_NO_LOCK)) 445 if (!(flags & EXT4_GET_BLOCKS_NO_LOCK))
446 down_read((&EXT4_I(inode)->i_data_sem)); 446 down_read(&EXT4_I(inode)->i_data_sem);
447 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) { 447 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
448 retval = ext4_ext_map_blocks(handle, inode, map, flags & 448 retval = ext4_ext_map_blocks(handle, inode, map, flags &
449 EXT4_GET_BLOCKS_KEEP_SIZE); 449 EXT4_GET_BLOCKS_KEEP_SIZE);
@@ -555,7 +555,7 @@ int ext4_map_blocks(handle_t *handle, struct inode *inode,
555 * file system block. 555 * file system block.
556 */ 556 */
557 if (!(flags & EXT4_GET_BLOCKS_NO_LOCK)) 557 if (!(flags & EXT4_GET_BLOCKS_NO_LOCK))
558 down_read((&EXT4_I(inode)->i_data_sem)); 558 down_read(&EXT4_I(inode)->i_data_sem);
559 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) { 559 if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
560 retval = ext4_ext_map_blocks(handle, inode, map, flags & 560 retval = ext4_ext_map_blocks(handle, inode, map, flags &
561 EXT4_GET_BLOCKS_KEEP_SIZE); 561 EXT4_GET_BLOCKS_KEEP_SIZE);
@@ -627,7 +627,7 @@ found:
627 * the write lock of i_data_sem, and call get_blocks() 627 * the write lock of i_data_sem, and call get_blocks()
628 * with create == 1 flag. 628 * with create == 1 flag.
629 */ 629 */
630 down_write((&EXT4_I(inode)->i_data_sem)); 630 down_write(&EXT4_I(inode)->i_data_sem);
631 631
632 /* 632 /*
633 * if the caller is from delayed allocation writeout path 633 * if the caller is from delayed allocation writeout path
@@ -1540,7 +1540,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
1540 ext4_es_lru_add(inode); 1540 ext4_es_lru_add(inode);
1541 if (ext4_es_is_hole(&es)) { 1541 if (ext4_es_is_hole(&es)) {
1542 retval = 0; 1542 retval = 0;
1543 down_read((&EXT4_I(inode)->i_data_sem)); 1543 down_read(&EXT4_I(inode)->i_data_sem);
1544 goto add_delayed; 1544 goto add_delayed;
1545 } 1545 }
1546 1546
@@ -1577,7 +1577,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
1577 * Try to see if we can get the block without requesting a new 1577 * Try to see if we can get the block without requesting a new
1578 * file system block. 1578 * file system block.
1579 */ 1579 */
1580 down_read((&EXT4_I(inode)->i_data_sem)); 1580 down_read(&EXT4_I(inode)->i_data_sem);
1581 if (ext4_has_inline_data(inode)) { 1581 if (ext4_has_inline_data(inode)) {
1582 /* 1582 /*
1583 * We will soon create blocks for this page, and let 1583 * We will soon create blocks for this page, and let
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
index 2ae73a80c19b..ec092437d3e0 100644
--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
@@ -505,7 +505,7 @@ int ext4_ext_migrate(struct inode *inode)
505 * with i_data_sem held to prevent racing with block 505 * with i_data_sem held to prevent racing with block
506 * allocation. 506 * allocation.
507 */ 507 */
508 down_read((&EXT4_I(inode)->i_data_sem)); 508 down_read(&EXT4_I(inode)->i_data_sem);
509 ext4_set_inode_state(inode, EXT4_STATE_EXT_MIGRATE); 509 ext4_set_inode_state(inode, EXT4_STATE_EXT_MIGRATE);
510 up_read((&EXT4_I(inode)->i_data_sem)); 510 up_read((&EXT4_I(inode)->i_data_sem));
511 511
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index b26a3959c8dd..84e330373f9e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1904,7 +1904,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
1904 if (!(sbi->s_mount_state & EXT4_VALID_FS)) 1904 if (!(sbi->s_mount_state & EXT4_VALID_FS))
1905 ext4_msg(sb, KERN_WARNING, "warning: mounting unchecked fs, " 1905 ext4_msg(sb, KERN_WARNING, "warning: mounting unchecked fs, "
1906 "running e2fsck is recommended"); 1906 "running e2fsck is recommended");
1907 else if ((sbi->s_mount_state & EXT4_ERROR_FS)) 1907 else if (sbi->s_mount_state & EXT4_ERROR_FS)
1908 ext4_msg(sb, KERN_WARNING, 1908 ext4_msg(sb, KERN_WARNING,
1909 "warning: mounting fs with errors, " 1909 "warning: mounting fs with errors, "
1910 "running e2fsck is recommended"); 1910 "running e2fsck is recommended");
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index c6ae6fab99be..3a5ac7cc4819 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -899,7 +899,7 @@ inserted:
899 * take i_data_sem because we will test 899 * take i_data_sem because we will test
900 * i_delalloc_reserved_flag in ext4_mb_new_blocks 900 * i_delalloc_reserved_flag in ext4_mb_new_blocks
901 */ 901 */
902 down_read((&EXT4_I(inode)->i_data_sem)); 902 down_read(&EXT4_I(inode)->i_data_sem);
903 block = ext4_new_meta_blocks(handle, inode, goal, 0, 903 block = ext4_new_meta_blocks(handle, inode, goal, 0,
904 NULL, &error); 904 NULL, &error);
905 up_read((&EXT4_I(inode)->i_data_sem)); 905 up_read((&EXT4_I(inode)->i_data_sem));