diff for duplicates of <4CF5A5E5.5040404@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 0560f5f..2653ef8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,29 +1,25 @@ Geert Uytterhoeven wrote: -> If CONFIG_LBDAF=3Dy, `sector_t' becomes `u64' instead of `unsigned lo= -ng': ->=20 -> fs/btrfs/inode.c: In function =A1btrfs_end_dio_bio=A2: -> fs/btrfs/inode.c:5717: warning: format =A1%lu=A2 expects type =A1long= - unsigned int=A2, but argument 4 has type =A1sector_t=A2 ->=20 +> If CONFIG_LBDAF=y, `sector_t' becomes `u64' instead of `unsigned long': +> +> fs/btrfs/inode.c: In function ‘btrfs_end_dio_bio’: +> fs/btrfs/inode.c:5717: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 4 has type ‘sector_t’ +> > Hence always cast it to `unsigned long long' for printing. ->=20 -> Introduced by commit e65e1535542931e51189832264cd282e5899e4b9 ("btrfs= -: fix +> +> Introduced by commit e65e1535542931e51189832264cd282e5899e4b9 ("btrfs: fix > panic caused by direct IO") ->=20 +> > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> While we are at this.. -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +=================== [PATCH] btrfs: Fix compile warning when CONFIG_MIGRATION is not set -=46ix this newly introduced warning: +Fix this newly introduced warning: -fs/btrfs/disk-io.c:699: warning: 'btree_migratepage' defined but not us= -ed +fs/btrfs/disk-io.c:699: warning: 'btree_migratepage' defined but not used Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- @@ -34,17 +30,15 @@ diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 33b6d45..7648247 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c -@@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inod= -e, int rw, struct bio *bio, +@@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, __btree_submit_bio_done); } -=20 + +#ifdef CONFIG_MIGRATION static int btree_migratepage(struct address_space *mapping, struct page *newpage, struct page *page) { -@@ -712,12 +713,10 @@ static int btree_migratepage(struct address_space= - *mapping, +@@ -712,12 +713,10 @@ static int btree_migratepage(struct address_space *mapping, if (page_has_private(page) && !try_to_release_page(page, GFP_KERNEL)) return -EAGAIN; @@ -56,9 +50,8 @@ e, int rw, struct bio *bio, -#endif } +#endif -=20 - static int btree_writepage(struct page *page, struct writeback_control= - *wbc) + + static int btree_writepage(struct page *page, struct writeback_control *wbc) { ---=20 +-- 1.6.3 diff --git a/a/content_digest b/N1/content_digest index 47538b8..3253e15 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,31 +11,27 @@ "\00:1\0" "b\0" "Geert Uytterhoeven wrote:\n" - "> If CONFIG_LBDAF=3Dy, `sector_t' becomes `u64' instead of `unsigned lo=\n" - "ng':\n" - ">=20\n" - "> fs/btrfs/inode.c: In function =A1btrfs_end_dio_bio=A2:\n" - "> fs/btrfs/inode.c:5717: warning: format =A1%lu=A2 expects type =A1long=\n" - " unsigned int=A2, but argument 4 has type =A1sector_t=A2\n" - ">=20\n" + "> If CONFIG_LBDAF=y, `sector_t' becomes `u64' instead of `unsigned long':\n" + "> \n" + "> fs/btrfs/inode.c: In function \342\200\230btrfs_end_dio_bio\342\200\231:\n" + "> fs/btrfs/inode.c:5717: warning: format \342\200\230%lu\342\200\231 expects type \342\200\230long unsigned int\342\200\231, but argument 4 has type \342\200\230sector_t\342\200\231\n" + "> \n" "> Hence always cast it to `unsigned long long' for printing.\n" - ">=20\n" - "> Introduced by commit e65e1535542931e51189832264cd282e5899e4b9 (\"btrfs=\n" - ": fix\n" + "> \n" + "> Introduced by commit e65e1535542931e51189832264cd282e5899e4b9 (\"btrfs: fix\n" "> panic caused by direct IO\")\n" - ">=20\n" + "> \n" "> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>\n" "\n" "While we are at this..\n" "\n" - "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n" + "===================\n" "\n" "[PATCH] btrfs: Fix compile warning when CONFIG_MIGRATION is not set\n" "\n" - "=46ix this newly introduced warning:\n" + "Fix this newly introduced warning:\n" "\n" - "fs/btrfs/disk-io.c:699: warning: 'btree_migratepage' defined but not us=\n" - "ed\n" + "fs/btrfs/disk-io.c:699: warning: 'btree_migratepage' defined but not used\n" "\n" "Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>\n" "---\n" @@ -46,17 +42,15 @@ "index 33b6d45..7648247 100644\n" "--- a/fs/btrfs/disk-io.c\n" "+++ b/fs/btrfs/disk-io.c\n" - "@@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inod=\n" - "e, int rw, struct bio *bio,\n" + "@@ -696,6 +696,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,\n" " \t\t\t\t __btree_submit_bio_done);\n" " }\n" - "=20\n" + " \n" "+#ifdef CONFIG_MIGRATION\n" " static int btree_migratepage(struct address_space *mapping,\n" " \t\t\tstruct page *newpage, struct page *page)\n" " {\n" - "@@ -712,12 +713,10 @@ static int btree_migratepage(struct address_space=\n" - " *mapping,\n" + "@@ -712,12 +713,10 @@ static int btree_migratepage(struct address_space *mapping,\n" " \tif (page_has_private(page) &&\n" " \t !try_to_release_page(page, GFP_KERNEL))\n" " \t\treturn -EAGAIN;\n" @@ -68,11 +62,10 @@ "-#endif\n" " }\n" "+#endif\n" - "=20\n" - " static int btree_writepage(struct page *page, struct writeback_control=\n" - " *wbc)\n" + " \n" + " static int btree_writepage(struct page *page, struct writeback_control *wbc)\n" " {\n" - "--=20\n" + "-- \n" 1.6.3 -59ae498c529921d2d3a886fa43c1acda2202a3e0f6394133bf7f4d57a2ef2cb6 +ac712b197d5746cd19ee043a1e22dac2f31fa924991e3dd5bdf0bf81d667651e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.