Skip to contentSkip to conversation

btrfs: reada: simplify dev->reada_in_flight processing

DISCUSSION Dan Carpenter 3 participants 3 messages Feb 17, 2016 – Feb 18, 2016 Btrfs file system

lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

Hello Zhao Lei,

The patch 7aff519c04d2: "btrfs: reada: simplify dev->reada_in_flight processing" from Jan 12, 2016, leads to the following static checker warning:

	fs/btrfs/reada.c:697 reada_start_machine_dev()
	warn: inconsistent indenting

fs/btrfs/reada.c
688 spin_unlock(&fs_info->reada_lock);
689 return 0;

   690          }
   691          dev->reada_next = re->logical + fs_info->tree_root->nodesize;
   692          re->refcnt++;

693
694 spin_unlock(&fs_info->reada_lock);
695
696 spin_lock(&re->lock);
697 if (re->scheduled || list_empty(&re->extctl)) {

This is indented too much.

   698                          spin_unlock(&re->lock);
   699                          reada_extent_put(fs_info, re);
   700                          return 0;

701 }
702 re->scheduled = 1;
703 spin_unlock(&re->lock);
704

regards,
dan carpenter

#1 lore raw

Hi, Dan Carpenter

Quoted 28 lines

From: Dan Carpenter [mailto:[email protected]]
Sent: Thursday, February 18, 2016 3:02 AM
To: [email protected]
Cc: [email protected]
Subject: re: btrfs: reada: simplify dev->reada_in_flight processing

Hello Zhao Lei,

The patch 7aff519c04d2: "btrfs: reada: simplify dev->reada_in_flight processing" from Jan 12, 2016, leads to the following static checker warning:

	fs/btrfs/reada.c:697 reada_start_machine_dev()
	warn: inconsistent indenting

fs/btrfs/reada.c

   688                  spin_unlock(&fs_info->reada_lock);
   689                  return 0;
   690          }
   691          dev->reada_next = re->logical +
fs_info->tree_root->nodesize;
   692          re->refcnt++;
   693
   694          spin_unlock(&fs_info->reada_lock);
   695
   696          spin_lock(&re->lock);
   697                  if (re->scheduled || list_empty(&re->extctl)) {
Quoted 2 lines

This is indented too much.

Thanks for report.

This problem is introduced in patch titled:
btrfs: reada: Move is_need_to_readahead contition earlier

I'll fix it.

CC: David Sterba <[email protected]>
I'll fix this indent problem in following branch:
https://github.com/zhaoleidd/btrfs.git integration-4.5

Could you pick them again?

Thanks
Zhaolei

Quoted 10 lines
   698                          spin_unlock(&re->lock);
   699                          reada_extent_put(fs_info, re);
   700                          return 0;
   701                  }
   702                  re->scheduled = 1;
   703          spin_unlock(&re->lock);
   704

regards,
dan carpenter