From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ross Zwisler Subject: [PATCH] dax: fix build warnings with FS_DAX and !FS_IOMAP Date: Tue, 10 Jan 2017 15:29:43 -0700 Message-ID: <1484087383-29478-1-git-send-email-ross.zwisler@linux.intel.com> References: <1946137.McqY686LOu@wuerfel> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Theodore Ts'o , Arnd Bergmann , "Darrick J. Wong" , Matthew Wilcox , linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, Andreas Dilger , Alexander Viro , linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jan Kara , linux-ext4-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Christoph Hellwig To: Andrew Morton , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Return-path: In-Reply-To: <1946137.McqY686LOu@wuerfel> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org Sender: "Linux-nvdimm" List-Id: linux-ext4.vger.kernel.org QXMgcmVwb3J0ZWQgYnkgQXJuZDoKCmh0dHBzOi8vbGttbC5vcmcvbGttbC8yMDE3LzEvMTAvNzU2 CgpDb21waWxpbmcgd2l0aCB0aGUgZm9sbG93aW5nIGNvbmZpZ3VyYXRpb246CgogICMgQ09ORklH X0VYVDJfRlMgaXMgbm90IHNldAogICMgQ09ORklHX0VYVDRfRlMgaXMgbm90IHNldAogICMgQ09O RklHX1hGU19GUyBpcyBub3Qgc2V0CiAgIyBDT05GSUdfRlNfSU9NQVAgZGVwZW5kcyBvbiB0aGUg YWJvdmUgZmlsZXN5c3RlbXMsIGFzIGlzIG5vdCBzZXQKICBDT05GSUdfRlNfREFYPXkKCmdlbmVy YXRlcyBidWlsZCB3YXJuaW5ncyBhYm91dCB1bnVzZWQgZnVuY3Rpb25zIGluIGZzL2RheC5jOgoK ZnMvZGF4LmM6ODc4OjEyOiB3YXJuaW5nOiDigJhkYXhfaW5zZXJ0X21hcHBpbmfigJkgZGVmaW5l ZCBidXQgbm90IHVzZWQgWy1XdW51c2VkLWZ1bmN0aW9uXQogc3RhdGljIGludCBkYXhfaW5zZXJ0 X21hcHBpbmcoc3RydWN0IGFkZHJlc3Nfc3BhY2UgKm1hcHBpbmcsCiAgICAgICAgICAgIF5+fn5+ fn5+fn5+fn5+fn5+fgpmcy9kYXguYzo1NzI6MTI6IHdhcm5pbmc6IOKAmGNvcHlfdXNlcl9kYXji gJkgZGVmaW5lZCBidXQgbm90IHVzZWQgWy1XdW51c2VkLWZ1bmN0aW9uXQogc3RhdGljIGludCBj b3B5X3VzZXJfZGF4KHN0cnVjdCBibG9ja19kZXZpY2UgKmJkZXYsIHNlY3Rvcl90IHNlY3Rvciwg c2l6ZV90IHNpemUsCiAgICAgICAgICAgIF5+fn5+fn5+fn5+fn4KZnMvZGF4LmM6NTQyOjEyOiB3 YXJuaW5nOiDigJhkYXhfbG9hZF9ob2xl4oCZIGRlZmluZWQgYnV0IG5vdCB1c2VkIFstV3VudXNl ZC1mdW5jdGlvbl0KIHN0YXRpYyBpbnQgZGF4X2xvYWRfaG9sZShzdHJ1Y3QgYWRkcmVzc19zcGFj ZSAqbWFwcGluZywgdm9pZCAqKmVudHJ5LAogICAgICAgICAgICBefn5+fn5+fn5+fn5+CmZzL2Rh eC5jOjMxMjoxNDogd2FybmluZzog4oCYZ3JhYl9tYXBwaW5nX2VudHJ54oCZIGRlZmluZWQgYnV0 IG5vdCB1c2VkIFstV3VudXNlZC1mdW5jdGlvbl0KIHN0YXRpYyB2b2lkICpncmFiX21hcHBpbmdf ZW50cnkoc3RydWN0IGFkZHJlc3Nfc3BhY2UgKm1hcHBpbmcsIHBnb2ZmX3QgaW5kZXgsCiAgICAg ICAgICAgICAgXn5+fn5+fn5+fn5+fn5+fn5+CgpOb3cgdGhhdCB0aGUgc3RydWN0IGJ1ZmZlcl9o ZWFkIGJhc2VkIERBWCBmYXVsdCBwYXRocyBhbmQgSS9PIHBhdGggaGF2ZQpiZWVuIHJlbW92ZWQg d2UgcmVhbGx5IGRlcGVuZCBvbiBpb21hcCBzdXBwb3J0IGJlaW5nIHByZXNlbnQgZm9yIERBWC4g IE1ha2UKdGhpcyBleHBsaWNpdCBieSBzZWxlY3RpbmcgRlNfSU9NQVAgaWYgd2UgY29tcGlsZSBp biBEQVggc3VwcG9ydC4KClRoaXMgYWxsb3dzIHVzIHRvIHJlbW92ZSBjb25kaXRpb25hbCBzZWxl Y3Rpb25zIG9mIEZTX0lPTUFQIHdoZW4gRlNfREFYIHdhcwpwcmVzZW50IGZvciBleHQyIGFuZCBl eHQ0LCBhbmQgdG8gcmVtb3ZlIGFuICNpZmRlZiBpbiBmcy9kYXguYy4KClNpZ25lZC1vZmYtYnk6 IFJvc3MgWndpc2xlciA8cm9zcy56d2lzbGVyQGxpbnV4LmludGVsLmNvbT4KUmVwb3J0ZWQtYnk6 IEFybmQgQmVyZ21hbm4gPGFybmRAYXJuZGIuZGU+CkNjOiBKYW4gS2FyYSA8amFja0BzdXNlLmN6 PgpDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+Ci0tLQogZnMvS2NvbmZpZyAgICAg IHwgMSArCiBmcy9kYXguYyAgICAgICAgfCAyIC0tCiBmcy9leHQyL0tjb25maWcgfCAxIC0KIGZz L2V4dDQvS2NvbmZpZyB8IDEgLQogNCBmaWxlcyBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgNCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9mcy9LY29uZmlnIGIvZnMvS2NvbmZpZwppbmRleCBj MmEzNzdjLi44M2VhYjUyIDEwMDY0NAotLS0gYS9mcy9LY29uZmlnCisrKyBiL2ZzL0tjb25maWcK QEAgLTM4LDYgKzM4LDcgQEAgY29uZmlnIEZTX0RBWAogCWJvb2wgIkRpcmVjdCBBY2Nlc3MgKERB WCkgc3VwcG9ydCIKIAlkZXBlbmRzIG9uIE1NVQogCWRlcGVuZHMgb24gIShBUk0gfHwgTUlQUyB8 fCBTUEFSQykKKwlzZWxlY3QgRlNfSU9NQVAKIAloZWxwCiAJICBEaXJlY3QgQWNjZXNzIChEQVgp IGNhbiBiZSB1c2VkIG9uIG1lbW9yeS1iYWNrZWQgYmxvY2sgZGV2aWNlcy4KIAkgIElmIHRoZSBi bG9jayBkZXZpY2Ugc3VwcG9ydHMgREFYIGFuZCB0aGUgZmlsZXN5c3RlbSBzdXBwb3J0cyBEQVgs CmRpZmYgLS1naXQgYS9mcy9kYXguYyBiL2ZzL2RheC5jCmluZGV4IDVjNzRmNjAuLjA4M2I5NTAg MTAwNjQ0Ci0tLSBhL2ZzL2RheC5jCisrKyBiL2ZzL2RheC5jCkBAIC05NjksNyArOTY5LDYgQEAg aW50IF9fZGF4X3plcm9fcGFnZV9yYW5nZShzdHJ1Y3QgYmxvY2tfZGV2aWNlICpiZGV2LCBzZWN0 b3JfdCBzZWN0b3IsCiB9CiBFWFBPUlRfU1lNQk9MX0dQTChfX2RheF96ZXJvX3BhZ2VfcmFuZ2Up OwogCi0jaWZkZWYgQ09ORklHX0ZTX0lPTUFQCiBzdGF0aWMgc2VjdG9yX3QgZGF4X2lvbWFwX3Nl Y3RvcihzdHJ1Y3QgaW9tYXAgKmlvbWFwLCBsb2ZmX3QgcG9zKQogewogCXJldHVybiBpb21hcC0+ Ymxrbm8gKyAoKChwb3MgJiBQQUdFX01BU0spIC0gaW9tYXAtPm9mZnNldCkgPj4gOSk7CkBAIC0x NDA3LDQgKzE0MDYsMyBAQCBpbnQgZGF4X2lvbWFwX3BtZF9mYXVsdChzdHJ1Y3Qgdm1fYXJlYV9z dHJ1Y3QgKnZtYSwgdW5zaWduZWQgbG9uZyBhZGRyZXNzLAogfQogRVhQT1JUX1NZTUJPTF9HUEwo ZGF4X2lvbWFwX3BtZF9mYXVsdCk7CiAjZW5kaWYgLyogQ09ORklHX0ZTX0RBWF9QTUQgKi8KLSNl bmRpZiAvKiBDT05GSUdfRlNfSU9NQVAgKi8KZGlmZiAtLWdpdCBhL2ZzL2V4dDIvS2NvbmZpZyBi L2ZzL2V4dDIvS2NvbmZpZwppbmRleCAzNmJlYTVhLi5jNjM0ODc0ZSAxMDA2NDQKLS0tIGEvZnMv ZXh0Mi9LY29uZmlnCisrKyBiL2ZzL2V4dDIvS2NvbmZpZwpAQCAtMSw2ICsxLDUgQEAKIGNvbmZp ZyBFWFQyX0ZTCiAJdHJpc3RhdGUgIlNlY29uZCBleHRlbmRlZCBmcyBzdXBwb3J0IgotCXNlbGVj dCBGU19JT01BUCBpZiBGU19EQVgKIAloZWxwCiAJICBFeHQyIGlzIGEgc3RhbmRhcmQgTGludXgg ZmlsZSBzeXN0ZW0gZm9yIGhhcmQgZGlza3MuCiAKZGlmZiAtLWdpdCBhL2ZzL2V4dDQvS2NvbmZp ZyBiL2ZzL2V4dDQvS2NvbmZpZwppbmRleCA3YjkwNjkxLi5lMzgwMzlmIDEwMDY0NAotLS0gYS9m cy9leHQ0L0tjb25maWcKKysrIGIvZnMvZXh0NC9LY29uZmlnCkBAIC0zNyw3ICszNyw2IEBAIGNv bmZpZyBFWFQ0X0ZTCiAJc2VsZWN0IENSQzE2CiAJc2VsZWN0IENSWVBUTwogCXNlbGVjdCBDUllQ VE9fQ1JDMzJDCi0Jc2VsZWN0IEZTX0lPTUFQIGlmIEZTX0RBWAogCWhlbHAKIAkgIFRoaXMgaXMg dGhlIG5leHQgZ2VuZXJhdGlvbiBvZiB0aGUgZXh0MyBmaWxlc3lzdGVtLgogCi0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTGludXgtbnZk aW1tIG1haWxpbmcgbGlzdApMaW51eC1udmRpbW1AbGlzdHMuMDEub3JnCmh0dHBzOi8vbGlzdHMu MDEub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtbnZkaW1tCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CE6BF81B14 for ; Tue, 10 Jan 2017 14:30:03 -0800 (PST) From: Ross Zwisler Subject: [PATCH] dax: fix build warnings with FS_DAX and !FS_IOMAP Date: Tue, 10 Jan 2017 15:29:43 -0700 Message-Id: <1484087383-29478-1-git-send-email-ross.zwisler@linux.intel.com> In-Reply-To: <1946137.McqY686LOu@wuerfel> References: <1946137.McqY686LOu@wuerfel> MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Andrew Morton , linux-kernel@vger.kernel.org Cc: Theodore Ts'o , Arnd Bergmann , "Darrick J. Wong" , Matthew Wilcox , linux-nvdimm@lists.01.org, Andreas Dilger , Alexander Viro , linux-fsdevel@vger.kernel.org, Jan Kara , linux-ext4@vger.kernel.org, Christoph Hellwig List-ID: QXMgcmVwb3J0ZWQgYnkgQXJuZDoKCmh0dHBzOi8vbGttbC5vcmcvbGttbC8yMDE3LzEvMTAvNzU2 CgpDb21waWxpbmcgd2l0aCB0aGUgZm9sbG93aW5nIGNvbmZpZ3VyYXRpb246CgogICMgQ09ORklH X0VYVDJfRlMgaXMgbm90IHNldAogICMgQ09ORklHX0VYVDRfRlMgaXMgbm90IHNldAogICMgQ09O RklHX1hGU19GUyBpcyBub3Qgc2V0CiAgIyBDT05GSUdfRlNfSU9NQVAgZGVwZW5kcyBvbiB0aGUg YWJvdmUgZmlsZXN5c3RlbXMsIGFzIGlzIG5vdCBzZXQKICBDT05GSUdfRlNfREFYPXkKCmdlbmVy YXRlcyBidWlsZCB3YXJuaW5ncyBhYm91dCB1bnVzZWQgZnVuY3Rpb25zIGluIGZzL2RheC5jOgoK ZnMvZGF4LmM6ODc4OjEyOiB3YXJuaW5nOiDigJhkYXhfaW5zZXJ0X21hcHBpbmfigJkgZGVmaW5l ZCBidXQgbm90IHVzZWQgWy1XdW51c2VkLWZ1bmN0aW9uXQogc3RhdGljIGludCBkYXhfaW5zZXJ0 X21hcHBpbmcoc3RydWN0IGFkZHJlc3Nfc3BhY2UgKm1hcHBpbmcsCiAgICAgICAgICAgIF5+fn5+ fn5+fn5+fn5+fn5+fgpmcy9kYXguYzo1NzI6MTI6IHdhcm5pbmc6IOKAmGNvcHlfdXNlcl9kYXji gJkgZGVmaW5lZCBidXQgbm90IHVzZWQgWy1XdW51c2VkLWZ1bmN0aW9uXQogc3RhdGljIGludCBj b3B5X3VzZXJfZGF4KHN0cnVjdCBibG9ja19kZXZpY2UgKmJkZXYsIHNlY3Rvcl90IHNlY3Rvciwg c2l6ZV90IHNpemUsCiAgICAgICAgICAgIF5+fn5+fn5+fn5+fn4KZnMvZGF4LmM6NTQyOjEyOiB3 YXJuaW5nOiDigJhkYXhfbG9hZF9ob2xl4oCZIGRlZmluZWQgYnV0IG5vdCB1c2VkIFstV3VudXNl ZC1mdW5jdGlvbl0KIHN0YXRpYyBpbnQgZGF4X2xvYWRfaG9sZShzdHJ1Y3QgYWRkcmVzc19zcGFj ZSAqbWFwcGluZywgdm9pZCAqKmVudHJ5LAogICAgICAgICAgICBefn5+fn5+fn5+fn5+CmZzL2Rh eC5jOjMxMjoxNDogd2FybmluZzog4oCYZ3JhYl9tYXBwaW5nX2VudHJ54oCZIGRlZmluZWQgYnV0 IG5vdCB1c2VkIFstV3VudXNlZC1mdW5jdGlvbl0KIHN0YXRpYyB2b2lkICpncmFiX21hcHBpbmdf ZW50cnkoc3RydWN0IGFkZHJlc3Nfc3BhY2UgKm1hcHBpbmcsIHBnb2ZmX3QgaW5kZXgsCiAgICAg ICAgICAgICAgXn5+fn5+fn5+fn5+fn5+fn5+CgpOb3cgdGhhdCB0aGUgc3RydWN0IGJ1ZmZlcl9o ZWFkIGJhc2VkIERBWCBmYXVsdCBwYXRocyBhbmQgSS9PIHBhdGggaGF2ZQpiZWVuIHJlbW92ZWQg d2UgcmVhbGx5IGRlcGVuZCBvbiBpb21hcCBzdXBwb3J0IGJlaW5nIHByZXNlbnQgZm9yIERBWC4g IE1ha2UKdGhpcyBleHBsaWNpdCBieSBzZWxlY3RpbmcgRlNfSU9NQVAgaWYgd2UgY29tcGlsZSBp biBEQVggc3VwcG9ydC4KClRoaXMgYWxsb3dzIHVzIHRvIHJlbW92ZSBjb25kaXRpb25hbCBzZWxl Y3Rpb25zIG9mIEZTX0lPTUFQIHdoZW4gRlNfREFYIHdhcwpwcmVzZW50IGZvciBleHQyIGFuZCBl eHQ0LCBhbmQgdG8gcmVtb3ZlIGFuICNpZmRlZiBpbiBmcy9kYXguYy4KClNpZ25lZC1vZmYtYnk6 IFJvc3MgWndpc2xlciA8cm9zcy56d2lzbGVyQGxpbnV4LmludGVsLmNvbT4KUmVwb3J0ZWQtYnk6 IEFybmQgQmVyZ21hbm4gPGFybmRAYXJuZGIuZGU+CkNjOiBKYW4gS2FyYSA8amFja0BzdXNlLmN6 PgpDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+Ci0tLQogZnMvS2NvbmZpZyAgICAg IHwgMSArCiBmcy9kYXguYyAgICAgICAgfCAyIC0tCiBmcy9leHQyL0tjb25maWcgfCAxIC0KIGZz L2V4dDQvS2NvbmZpZyB8IDEgLQogNCBmaWxlcyBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgNCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9mcy9LY29uZmlnIGIvZnMvS2NvbmZpZwppbmRleCBj MmEzNzdjLi44M2VhYjUyIDEwMDY0NAotLS0gYS9mcy9LY29uZmlnCisrKyBiL2ZzL0tjb25maWcK QEAgLTM4LDYgKzM4LDcgQEAgY29uZmlnIEZTX0RBWAogCWJvb2wgIkRpcmVjdCBBY2Nlc3MgKERB WCkgc3VwcG9ydCIKIAlkZXBlbmRzIG9uIE1NVQogCWRlcGVuZHMgb24gIShBUk0gfHwgTUlQUyB8 fCBTUEFSQykKKwlzZWxlY3QgRlNfSU9NQVAKIAloZWxwCiAJICBEaXJlY3QgQWNjZXNzIChEQVgp IGNhbiBiZSB1c2VkIG9uIG1lbW9yeS1iYWNrZWQgYmxvY2sgZGV2aWNlcy4KIAkgIElmIHRoZSBi bG9jayBkZXZpY2Ugc3VwcG9ydHMgREFYIGFuZCB0aGUgZmlsZXN5c3RlbSBzdXBwb3J0cyBEQVgs CmRpZmYgLS1naXQgYS9mcy9kYXguYyBiL2ZzL2RheC5jCmluZGV4IDVjNzRmNjAuLjA4M2I5NTAg MTAwNjQ0Ci0tLSBhL2ZzL2RheC5jCisrKyBiL2ZzL2RheC5jCkBAIC05NjksNyArOTY5LDYgQEAg aW50IF9fZGF4X3plcm9fcGFnZV9yYW5nZShzdHJ1Y3QgYmxvY2tfZGV2aWNlICpiZGV2LCBzZWN0 b3JfdCBzZWN0b3IsCiB9CiBFWFBPUlRfU1lNQk9MX0dQTChfX2RheF96ZXJvX3BhZ2VfcmFuZ2Up OwogCi0jaWZkZWYgQ09ORklHX0ZTX0lPTUFQCiBzdGF0aWMgc2VjdG9yX3QgZGF4X2lvbWFwX3Nl Y3RvcihzdHJ1Y3QgaW9tYXAgKmlvbWFwLCBsb2ZmX3QgcG9zKQogewogCXJldHVybiBpb21hcC0+ Ymxrbm8gKyAoKChwb3MgJiBQQUdFX01BU0spIC0gaW9tYXAtPm9mZnNldCkgPj4gOSk7CkBAIC0x NDA3LDQgKzE0MDYsMyBAQCBpbnQgZGF4X2lvbWFwX3BtZF9mYXVsdChzdHJ1Y3Qgdm1fYXJlYV9z dHJ1Y3QgKnZtYSwgdW5zaWduZWQgbG9uZyBhZGRyZXNzLAogfQogRVhQT1JUX1NZTUJPTF9HUEwo ZGF4X2lvbWFwX3BtZF9mYXVsdCk7CiAjZW5kaWYgLyogQ09ORklHX0ZTX0RBWF9QTUQgKi8KLSNl bmRpZiAvKiBDT05GSUdfRlNfSU9NQVAgKi8KZGlmZiAtLWdpdCBhL2ZzL2V4dDIvS2NvbmZpZyBi L2ZzL2V4dDIvS2NvbmZpZwppbmRleCAzNmJlYTVhLi5jNjM0ODc0ZSAxMDA2NDQKLS0tIGEvZnMv ZXh0Mi9LY29uZmlnCisrKyBiL2ZzL2V4dDIvS2NvbmZpZwpAQCAtMSw2ICsxLDUgQEAKIGNvbmZp ZyBFWFQyX0ZTCiAJdHJpc3RhdGUgIlNlY29uZCBleHRlbmRlZCBmcyBzdXBwb3J0IgotCXNlbGVj dCBGU19JT01BUCBpZiBGU19EQVgKIAloZWxwCiAJICBFeHQyIGlzIGEgc3RhbmRhcmQgTGludXgg ZmlsZSBzeXN0ZW0gZm9yIGhhcmQgZGlza3MuCiAKZGlmZiAtLWdpdCBhL2ZzL2V4dDQvS2NvbmZp ZyBiL2ZzL2V4dDQvS2NvbmZpZwppbmRleCA3YjkwNjkxLi5lMzgwMzlmIDEwMDY0NAotLS0gYS9m cy9leHQ0L0tjb25maWcKKysrIGIvZnMvZXh0NC9LY29uZmlnCkBAIC0zNyw3ICszNyw2IEBAIGNv bmZpZyBFWFQ0X0ZTCiAJc2VsZWN0IENSQzE2CiAJc2VsZWN0IENSWVBUTwogCXNlbGVjdCBDUllQ VE9fQ1JDMzJDCi0Jc2VsZWN0IEZTX0lPTUFQIGlmIEZTX0RBWAogCWhlbHAKIAkgIFRoaXMgaXMg dGhlIG5leHQgZ2VuZXJhdGlvbiBvZiB0aGUgZXh0MyBmaWxlc3lzdGVtLgogCi0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTGludXgtbnZk aW1tIG1haWxpbmcgbGlzdApMaW51eC1udmRpbW1AbGlzdHMuMDEub3JnCmh0dHBzOi8vbGlzdHMu MDEub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtbnZkaW1tCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com ([134.134.136.65]:43681 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521AbdAJWaF (ORCPT ); Tue, 10 Jan 2017 17:30:05 -0500 From: Ross Zwisler To: Andrew Morton , linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Darrick J. Wong" , "Theodore Ts'o" , Alexander Viro , Andreas Dilger , Christoph Hellwig , Dan Williams , Jan Kara , Matthew Wilcox , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, Arnd Bergmann Subject: [PATCH] dax: fix build warnings with FS_DAX and !FS_IOMAP Date: Tue, 10 Jan 2017 15:29:43 -0700 Message-Id: <1484087383-29478-1-git-send-email-ross.zwisler@linux.intel.com> In-Reply-To: <1946137.McqY686LOu@wuerfel> References: <1946137.McqY686LOu@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org List-ID: As reported by Arnd: https://lkml.org/lkml/2017/1/10/756 Compiling with the following configuration: # CONFIG_EXT2_FS is not set # CONFIG_EXT4_FS is not set # CONFIG_XFS_FS is not set # CONFIG_FS_IOMAP depends on the above filesystems, as is not set CONFIG_FS_DAX=y generates build warnings about unused functions in fs/dax.c: fs/dax.c:878:12: warning: ‘dax_insert_mapping’ defined but not used [-Wunused-function] static int dax_insert_mapping(struct address_space *mapping, ^~~~~~~~~~~~~~~~~~ fs/dax.c:572:12: warning: ‘copy_user_dax’ defined but not used [-Wunused-function] static int copy_user_dax(struct block_device *bdev, sector_t sector, size_t size, ^~~~~~~~~~~~~ fs/dax.c:542:12: warning: ‘dax_load_hole’ defined but not used [-Wunused-function] static int dax_load_hole(struct address_space *mapping, void **entry, ^~~~~~~~~~~~~ fs/dax.c:312:14: warning: ‘grab_mapping_entry’ defined but not used [-Wunused-function] static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, ^~~~~~~~~~~~~~~~~~ Now that the struct buffer_head based DAX fault paths and I/O path have been removed we really depend on iomap support being present for DAX. Make this explicit by selecting FS_IOMAP if we compile in DAX support. This allows us to remove conditional selections of FS_IOMAP when FS_DAX was present for ext2 and ext4, and to remove an #ifdef in fs/dax.c. Signed-off-by: Ross Zwisler Reported-by: Arnd Bergmann Cc: Jan Kara Cc: Christoph Hellwig --- fs/Kconfig | 1 + fs/dax.c | 2 -- fs/ext2/Kconfig | 1 - fs/ext4/Kconfig | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index c2a377c..83eab52 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -38,6 +38,7 @@ config FS_DAX bool "Direct Access (DAX) support" depends on MMU depends on !(ARM || MIPS || SPARC) + select FS_IOMAP help Direct Access (DAX) can be used on memory-backed block devices. If the block device supports DAX and the filesystem supports DAX, diff --git a/fs/dax.c b/fs/dax.c index 5c74f60..083b950 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -969,7 +969,6 @@ int __dax_zero_page_range(struct block_device *bdev, sector_t sector, } EXPORT_SYMBOL_GPL(__dax_zero_page_range); -#ifdef CONFIG_FS_IOMAP static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos) { return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9); @@ -1407,4 +1406,3 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, } EXPORT_SYMBOL_GPL(dax_iomap_pmd_fault); #endif /* CONFIG_FS_DAX_PMD */ -#endif /* CONFIG_FS_IOMAP */ diff --git a/fs/ext2/Kconfig b/fs/ext2/Kconfig index 36bea5a..c634874e 100644 --- a/fs/ext2/Kconfig +++ b/fs/ext2/Kconfig @@ -1,6 +1,5 @@ config EXT2_FS tristate "Second extended fs support" - select FS_IOMAP if FS_DAX help Ext2 is a standard Linux file system for hard disks. diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 7b90691..e38039f 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -37,7 +37,6 @@ config EXT4_FS select CRC16 select CRYPTO select CRYPTO_CRC32C - select FS_IOMAP if FS_DAX help This is the next generation of the ext3 filesystem. -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755613AbdAJWaH (ORCPT ); Tue, 10 Jan 2017 17:30:07 -0500 Received: from mga03.intel.com ([134.134.136.65]:43681 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521AbdAJWaF (ORCPT ); Tue, 10 Jan 2017 17:30:05 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,344,1477983600"; d="scan'208";a="1110761893" From: Ross Zwisler To: Andrew Morton , linux-kernel@vger.kernel.org Cc: Ross Zwisler , "Darrick J. Wong" , "Theodore Ts'o" , Alexander Viro , Andreas Dilger , Christoph Hellwig , Dan Williams , Jan Kara , Matthew Wilcox , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nvdimm@ml01.01.org, Arnd Bergmann Subject: [PATCH] dax: fix build warnings with FS_DAX and !FS_IOMAP Date: Tue, 10 Jan 2017 15:29:43 -0700 Message-Id: <1484087383-29478-1-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1946137.McqY686LOu@wuerfel> References: <1946137.McqY686LOu@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As reported by Arnd: https://lkml.org/lkml/2017/1/10/756 Compiling with the following configuration: # CONFIG_EXT2_FS is not set # CONFIG_EXT4_FS is not set # CONFIG_XFS_FS is not set # CONFIG_FS_IOMAP depends on the above filesystems, as is not set CONFIG_FS_DAX=y generates build warnings about unused functions in fs/dax.c: fs/dax.c:878:12: warning: ‘dax_insert_mapping’ defined but not used [-Wunused-function] static int dax_insert_mapping(struct address_space *mapping, ^~~~~~~~~~~~~~~~~~ fs/dax.c:572:12: warning: ‘copy_user_dax’ defined but not used [-Wunused-function] static int copy_user_dax(struct block_device *bdev, sector_t sector, size_t size, ^~~~~~~~~~~~~ fs/dax.c:542:12: warning: ‘dax_load_hole’ defined but not used [-Wunused-function] static int dax_load_hole(struct address_space *mapping, void **entry, ^~~~~~~~~~~~~ fs/dax.c:312:14: warning: ‘grab_mapping_entry’ defined but not used [-Wunused-function] static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, ^~~~~~~~~~~~~~~~~~ Now that the struct buffer_head based DAX fault paths and I/O path have been removed we really depend on iomap support being present for DAX. Make this explicit by selecting FS_IOMAP if we compile in DAX support. This allows us to remove conditional selections of FS_IOMAP when FS_DAX was present for ext2 and ext4, and to remove an #ifdef in fs/dax.c. Signed-off-by: Ross Zwisler Reported-by: Arnd Bergmann Cc: Jan Kara Cc: Christoph Hellwig --- fs/Kconfig | 1 + fs/dax.c | 2 -- fs/ext2/Kconfig | 1 - fs/ext4/Kconfig | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index c2a377c..83eab52 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -38,6 +38,7 @@ config FS_DAX bool "Direct Access (DAX) support" depends on MMU depends on !(ARM || MIPS || SPARC) + select FS_IOMAP help Direct Access (DAX) can be used on memory-backed block devices. If the block device supports DAX and the filesystem supports DAX, diff --git a/fs/dax.c b/fs/dax.c index 5c74f60..083b950 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -969,7 +969,6 @@ int __dax_zero_page_range(struct block_device *bdev, sector_t sector, } EXPORT_SYMBOL_GPL(__dax_zero_page_range); -#ifdef CONFIG_FS_IOMAP static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos) { return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9); @@ -1407,4 +1406,3 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, } EXPORT_SYMBOL_GPL(dax_iomap_pmd_fault); #endif /* CONFIG_FS_DAX_PMD */ -#endif /* CONFIG_FS_IOMAP */ diff --git a/fs/ext2/Kconfig b/fs/ext2/Kconfig index 36bea5a..c634874e 100644 --- a/fs/ext2/Kconfig +++ b/fs/ext2/Kconfig @@ -1,6 +1,5 @@ config EXT2_FS tristate "Second extended fs support" - select FS_IOMAP if FS_DAX help Ext2 is a standard Linux file system for hard disks. diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 7b90691..e38039f 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -37,7 +37,6 @@ config EXT4_FS select CRC16 select CRYPTO select CRYPTO_CRC32C - select FS_IOMAP if FS_DAX help This is the next generation of the ext3 filesystem. -- 2.7.4