From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969AbbHMVUi (ORCPT ); Thu, 13 Aug 2015 17:20:38 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:38639 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751682AbbHMVUf (ORCPT ); Thu, 13 Aug 2015 17:20:35 -0400 MIME-Version: 1.0 In-Reply-To: <1439484671-15718-8-git-send-email-ross.zwisler@linux.intel.com> References: <1439484671-15718-1-git-send-email-ross.zwisler@linux.intel.com> <1439484671-15718-8-git-send-email-ross.zwisler@linux.intel.com> Date: Thu, 13 Aug 2015 14:20:33 -0700 Message-ID: Subject: Re: [PATCH v2 7/7] pmem, dax: have direct_access use __pmem annotation From: Dan Williams To: Ross Zwisler Cc: "linux-kernel@vger.kernel.org" , "linux-nvdimm@lists.01.org" , Jonathan Corbet , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Jens Axboe , Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com, Alexander Viro , Matthew Wilcox , Jeff Layton , Christoph Hellwig , Andrew Morton , Omar Sandoval , Boaz Harrosh , Miklos Szeredi , Jan Kara , Wolfram Sang , =?UTF-8?Q?Uwe_Kleine=2DK=C3=B6nig?= , Gerald Schaefer , Ameen Ali , "Martin K. Petersen" , Sagi Grimberg , Mike Snitzer , Tejun Heo , Shaohua Li , Ming Lei , linux-doc@vger.kernel.org, linuxppc-dev , linux-s390@vger.kernel.org, linux-fsdevel , Dave Chinner Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 13, 2015 at 9:51 AM, Ross Zwisler wrote: > Update the annotation for the kaddr pointer returned by direct_access() > so that it is a __pmem pointer. This is consistent with the PMEM driver > and with how this direct_access() pointer is used in the DAX code. > > Signed-off-by: Ross Zwisler > --- > Documentation/filesystems/Locking | 3 ++- > arch/powerpc/sysdev/axonram.c | 7 ++++--- > drivers/block/brd.c | 4 ++-- > drivers/nvdimm/pmem.c | 4 ++-- > drivers/s390/block/dcssblk.c | 10 +++++---- > fs/block_dev.c | 2 +- > fs/dax.c | 44 +++++++++++++++++++++------------------ > include/linux/blkdev.h | 8 +++---- > 8 files changed, 45 insertions(+), 37 deletions(-) > > diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking > index 6a34a0f..06d4434 100644 > --- a/Documentation/filesystems/Locking > +++ b/Documentation/filesystems/Locking > @@ -397,7 +397,8 @@ prototypes: > int (*release) (struct gendisk *, fmode_t); > int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); > int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); > - int (*direct_access) (struct block_device *, sector_t, void **, unsigned long *); > + int (*direct_access) (struct block_device *, sector_t, void __pmem **, > + unsigned long *); So this collides with the __pfn_t work. I think the we have a reasonable chance of getting that in to 4.3, so I'd wait to see if we hit any major roadblocks with that set [1] before merging these. [1]: https://lists.01.org/pipermail/linux-nvdimm/2015-August/001803.html