Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc4c3c87 authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'cleanups-post-3.19' of... 

Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

 into for-linus-4.1

Signed-off-by: default avatarChris Mason <clm@fb.com>

Conflicts:
	fs/btrfs/disk-io.c
parents 9deed229 a4f3d2c4

fs/btrfs/async-thread.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ BTRFS_WORK_HELPER(scrubwrc_helper); 
BTRFS_WORK_HELPER(scrubnc_helper);



static struct __btrfs_workqueue *

__btrfs_alloc_workqueue(const char *name, int flags, int max_active,

__btrfs_alloc_workqueue(const char *name, unsigned int flags, int max_active,

			 int thresh)

{

	struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);
@@ -132,7 +132,7 @@ static inline void 
__btrfs_destroy_workqueue(struct __btrfs_workqueue *wq);



struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

					      int flags,

					      unsigned int flags,

					      int max_active,

					      int thresh)

{

fs/btrfs/async-thread.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ BTRFS_WORK_HELPER_PROTO(scrubwrc_helper); 
BTRFS_WORK_HELPER_PROTO(scrubnc_helper);



struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

					      int flags,

					      unsigned int flags,

					      int max_active,

					      int thresh);

void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t helper,

fs/btrfs/check-integrity.c

+1 −4
Original line number Diff line number Diff line
@@ -3241,8 +3241,5 @@ void btrfsic_unmount(struct btrfs_root *root, 


	mutex_unlock(&btrfsic_mutex);



	if (is_vmalloc_addr(state))

		vfree(state);

	else

		kfree(state);

	kvfree(state);

}

fs/btrfs/compression.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int comp_num_workspace[BTRFS_COMPRESS_TYPES]; 
static atomic_t comp_alloc_workspace[BTRFS_COMPRESS_TYPES];

static wait_queue_head_t comp_workspace_wait[BTRFS_COMPRESS_TYPES];



static struct btrfs_compress_op *btrfs_compress_op[] = {

static const struct btrfs_compress_op * const btrfs_compress_op[] = {

	&btrfs_zlib_compress,

	&btrfs_lzo_compress,

};

fs/btrfs/compression.h

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct btrfs_compress_op { 
			  size_t srclen, size_t destlen);

};



extern struct btrfs_compress_op btrfs_zlib_compress;

extern struct btrfs_compress_op btrfs_lzo_compress;

extern const struct btrfs_compress_op btrfs_zlib_compress;

extern const struct btrfs_compress_op btrfs_lzo_compress;



#endif