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

Commit 3dd1462e authored by Jan Beulich's avatar Jan Beulich Committed by Chris Mason
Browse files

Btrfs: fix compiler warnings 



... regarding an unused function when !MIGRATION, and regarding a
printk() format string vs argument mismatch.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent fdfb1e4f

fs/btrfs/disk-io.c

+2 −4
Original line number Diff line number Diff line
@@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, 
				   __btree_submit_bio_done);

}



#ifdef CONFIG_MIGRATION

static int btree_migratepage(struct address_space *mapping,

			struct page *newpage, struct page *page)

{
@@ -712,12 +713,9 @@ static int btree_migratepage(struct address_space *mapping, 
	if (page_has_private(page) &&

	    !try_to_release_page(page, GFP_KERNEL))

		return -EAGAIN;

#ifdef CONFIG_MIGRATION

	return migrate_page(mapping, newpage, page);

#else

	return -ENOSYS;

#endif

}

#endif



static int btree_writepage(struct page *page, struct writeback_control *wbc)

{

fs/btrfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -5712,9 +5712,9 @@ static void btrfs_end_dio_bio(struct bio *bio, int err) 


	if (err) {

		printk(KERN_ERR "btrfs direct IO failed ino %lu rw %lu "

		      "disk_bytenr %lu len %u err no %d\n",

		      dip->inode->i_ino, bio->bi_rw, bio->bi_sector,

		      bio->bi_size, err);

		      "sector %#Lx len %u err no %d\n",

		      dip->inode->i_ino, bio->bi_rw,

		      (unsigned long long)bio->bi_sector, bio->bi_size, err);

		dip->errors = 1;



		/*