Commit e1f60a65 authored by David Sterba's avatar David Sterba
Browse files

btrfs: add __pure attribute to functions 



The attribute is more relaxed than const and the functions could
dereference pointers, as long as the observable state is not changed. We
do have such functions, based on -Wsuggest-attribute=pure .

The visible effects of this patch are negligible, there are differences
in the assembly but hard to summarize.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4143cb8b

fs/btrfs/async-thread.c

+2 −4
Original line number Diff line number Diff line
@@ -53,14 +53,12 @@ struct btrfs_workqueue { 
	struct __btrfs_workqueue *high;

};



struct btrfs_fs_info *

btrfs_workqueue_owner(const struct __btrfs_workqueue *wq)

struct btrfs_fs_info * __pure btrfs_workqueue_owner(const struct __btrfs_workqueue *wq)

{

	return wq->fs_info;

}



struct btrfs_fs_info *

btrfs_work_owner(const struct btrfs_work *work)

struct btrfs_fs_info * __pure btrfs_work_owner(const struct btrfs_work *work)

{

	return work->wq->fs_info;

}

fs/btrfs/async-thread.h

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ void btrfs_queue_work(struct btrfs_workqueue *wq, 
void btrfs_destroy_workqueue(struct btrfs_workqueue *wq);

void btrfs_workqueue_set_max(struct btrfs_workqueue *wq, int max);

void btrfs_set_work_high_priority(struct btrfs_work *work);

struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work);

struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq);

struct btrfs_fs_info * __pure btrfs_work_owner(const struct btrfs_work *work);

struct btrfs_fs_info * __pure btrfs_workqueue_owner(const struct __btrfs_workqueue *wq);

bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq);



#endif

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,7 @@ static int comp_keys(const struct btrfs_disk_key *disk, 
/*

 * same as comp_keys only with two btrfs_key's

 */

int btrfs_comp_cpu_keys(const struct btrfs_key *k1, const struct btrfs_key *k2)

int __pure btrfs_comp_cpu_keys(const struct btrfs_key *k1, const struct btrfs_key *k2)

{

	if (k1->objectid > k2->objectid)

		return 1;

fs/btrfs/ctree.h

+2 −2
Original line number Diff line number Diff line
@@ -2508,7 +2508,7 @@ void btrfs_wait_for_snapshot_creation(struct btrfs_root *root); 
/* ctree.c */

int btrfs_bin_search(struct extent_buffer *eb, const struct btrfs_key *key,

		     int level, int *slot);

int btrfs_comp_cpu_keys(const struct btrfs_key *k1, const struct btrfs_key *k2);

int __pure btrfs_comp_cpu_keys(const struct btrfs_key *k1, const struct btrfs_key *k2);

int btrfs_previous_item(struct btrfs_root *root,

			struct btrfs_path *path, u64 min_objectid,

			int type);
@@ -2907,7 +2907,7 @@ long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); 
long btrfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg);

int btrfs_ioctl_get_supported_features(void __user *arg);

void btrfs_sync_inode_flags_to_i_flags(struct inode *inode);

int btrfs_is_empty_uuid(u8 *uuid);

int __pure btrfs_is_empty_uuid(u8 *uuid);

int btrfs_defrag_file(struct inode *inode, struct file *file,

		      struct btrfs_ioctl_defrag_range_args *range,

		      u64 newer_than, unsigned long max_pages);

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ static int btrfs_dev_replace_kthread(void *data) 
	return 0;

}



int btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace)

int __pure btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace)

{

	if (!dev_replace->is_valid)

		return 0;