From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA878C4363A for ; Fri, 30 Oct 2020 13:07:45 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 006B7206FA for ; Fri, 30 Oct 2020 13:07:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="jSx4F1KE"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="fGZUzjb7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="CBZTvoof" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 006B7206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1kYU7v-0001w0-99; Fri, 30 Oct 2020 13:07:31 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYU7u-0001vr-0V for linux-f2fs-devel@lists.sourceforge.net; Fri, 30 Oct 2020 13:07:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cTpJmnFcN7KsVAMtG0h4uRF7P3Z5QrqdcQjFzjF3PSU=; b=jSx4F1KEENBcfRtm+glHN8HaW1 FXRW5rDzyxKfwZfwUAJixA78i9naJsi4CTQ6wFV3K0QtmNtJZnY4qQlLkw6cle4LjVYU9c8swQcle VTxVQvshhWqwtBjAOw7UfJOKl3Yubdp/WBxlN4QsNTE3OVsHuJW8BrB4LdtbN3StEEtU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=cTpJmnFcN7KsVAMtG0h4uRF7P3Z5QrqdcQjFzjF3PSU=; b=fGZUzjb75dCxm07/O6knmZH4uB +BQXY2NUwtsZpZ247l8/Hnbxq8hWGoyXHwLULR2vPCG13cQShaeJyMM114Zm6fkfYjRCpnvAVSFMq xyKeK9TrVHsNTNmE4SjQ3DUN+N2okHDfSk+XMyouljkoHqEhCUC5QZKzm5Y/E/Z6Cjg0=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1kYU7n-002Z9D-Mz for linux-f2fs-devel@lists.sourceforge.net; Fri, 30 Oct 2020 13:07:29 +0000 Received: from google.com (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E7DB520731; Fri, 30 Oct 2020 12:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604061061; bh=uAWtvTnGeRiAQGBeXWhiZ6TXWdrmX/qYwMYe3mrDHPk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CBZTvoofelM4iQ+RhR13m5AOlKzbdlWmqdzG6DRERIpYia2MuTcE12Vx9G+UlskjD FbSEQ5MSFHn/sHO5CMEtlymrrw4PSjhuFIkzCbiDXwHJIG1R5dczaI3zxpmG930+7Z vqevVQfiuSD7ep30JWzzPQbUK+KT4gSJ3V3gSjtE= Date: Fri, 30 Oct 2020 05:30:59 -0700 From: Jaegeuk Kim To: Chao Yu Message-ID: <20201030123059.GA1877745@google.com> References: <20201030072610.57155-1-yuchao0@huawei.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201030072610.57155-1-yuchao0@huawei.com> X-Headers-End: 1kYU7n-002Z9D-Mz Subject: Re: [f2fs-dev] [PATCH v2] f2fs: move ioctl interface definitions to separated file X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Hi Chao, Can we make a documentation for this in f2fs.rst? Thanks, On 10/30, Chao Yu wrote: > Like other filesystem does, we introduce a new file f2fs.h in path of > include/uapi/linux/, and move f2fs-specified ioctl interface definitions > to that file, after then, in order to use those definitions, userspace > developer only need to include the new header file rather than > copy & paste definitions from fs/f2fs/f2fs.h. > > Signed-off-by: Chao Yu > --- > v2: add missing "WITH Linux-syscall-note" for SPDX-License-Identifier > MAINTAINERS | 1 + > fs/f2fs/f2fs.h | 79 ---------------------------------- > fs/f2fs/file.c | 1 + > include/trace/events/f2fs.h | 1 + > include/uapi/linux/f2fs.h | 86 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 89 insertions(+), 79 deletions(-) > create mode 100644 include/uapi/linux/f2fs.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index d1d4e49a695a..b79a911f1e32 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6686,6 +6686,7 @@ F: Documentation/filesystems/f2fs.rst > F: fs/f2fs/ > F: include/linux/f2fs_fs.h > F: include/trace/events/f2fs.h > +F: include/uapi/linux/f2fs.h > > F71805F HARDWARE MONITORING DRIVER > M: Jean Delvare > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index cb700d797296..99bcf4b44a9c 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -402,85 +402,6 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal, > return size <= MAX_SIT_JENTRIES(journal); > } > > -/* > - * f2fs-specific ioctl commands > - */ > -#define F2FS_IOCTL_MAGIC 0xf5 > -#define F2FS_IOC_START_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 1) > -#define F2FS_IOC_COMMIT_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 2) > -#define F2FS_IOC_START_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 3) > -#define F2FS_IOC_RELEASE_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 4) > -#define F2FS_IOC_ABORT_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 5) > -#define F2FS_IOC_GARBAGE_COLLECT _IOW(F2FS_IOCTL_MAGIC, 6, __u32) > -#define F2FS_IOC_WRITE_CHECKPOINT _IO(F2FS_IOCTL_MAGIC, 7) > -#define F2FS_IOC_DEFRAGMENT _IOWR(F2FS_IOCTL_MAGIC, 8, \ > - struct f2fs_defragment) > -#define F2FS_IOC_MOVE_RANGE _IOWR(F2FS_IOCTL_MAGIC, 9, \ > - struct f2fs_move_range) > -#define F2FS_IOC_FLUSH_DEVICE _IOW(F2FS_IOCTL_MAGIC, 10, \ > - struct f2fs_flush_device) > -#define F2FS_IOC_GARBAGE_COLLECT_RANGE _IOW(F2FS_IOCTL_MAGIC, 11, \ > - struct f2fs_gc_range) > -#define F2FS_IOC_GET_FEATURES _IOR(F2FS_IOCTL_MAGIC, 12, __u32) > -#define F2FS_IOC_SET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 13, __u32) > -#define F2FS_IOC_GET_PIN_FILE _IOR(F2FS_IOCTL_MAGIC, 14, __u32) > -#define F2FS_IOC_PRECACHE_EXTENTS _IO(F2FS_IOCTL_MAGIC, 15) > -#define F2FS_IOC_RESIZE_FS _IOW(F2FS_IOCTL_MAGIC, 16, __u64) > -#define F2FS_IOC_GET_COMPRESS_BLOCKS _IOR(F2FS_IOCTL_MAGIC, 17, __u64) > -#define F2FS_IOC_RELEASE_COMPRESS_BLOCKS \ > - _IOR(F2FS_IOCTL_MAGIC, 18, __u64) > -#define F2FS_IOC_RESERVE_COMPRESS_BLOCKS \ > - _IOR(F2FS_IOCTL_MAGIC, 19, __u64) > -#define F2FS_IOC_SEC_TRIM_FILE _IOW(F2FS_IOCTL_MAGIC, 20, \ > - struct f2fs_sectrim_range) > - > -/* > - * should be same as XFS_IOC_GOINGDOWN. > - * Flags for going down operation used by FS_IOC_GOINGDOWN > - */ > -#define F2FS_IOC_SHUTDOWN _IOR('X', 125, __u32) /* Shutdown */ > -#define F2FS_GOING_DOWN_FULLSYNC 0x0 /* going down with full sync */ > -#define F2FS_GOING_DOWN_METASYNC 0x1 /* going down with metadata */ > -#define F2FS_GOING_DOWN_NOSYNC 0x2 /* going down */ > -#define F2FS_GOING_DOWN_METAFLUSH 0x3 /* going down with meta flush */ > -#define F2FS_GOING_DOWN_NEED_FSCK 0x4 /* going down to trigger fsck */ > - > -/* > - * Flags used by F2FS_IOC_SEC_TRIM_FILE > - */ > -#define F2FS_TRIM_FILE_DISCARD 0x1 /* send discard command */ > -#define F2FS_TRIM_FILE_ZEROOUT 0x2 /* zero out */ > -#define F2FS_TRIM_FILE_MASK 0x3 > - > -struct f2fs_gc_range { > - u32 sync; > - u64 start; > - u64 len; > -}; > - > -struct f2fs_defragment { > - u64 start; > - u64 len; > -}; > - > -struct f2fs_move_range { > - u32 dst_fd; /* destination fd */ > - u64 pos_in; /* start position in src_fd */ > - u64 pos_out; /* start position in dst_fd */ > - u64 len; /* size to move */ > -}; > - > -struct f2fs_flush_device { > - u32 dev_num; /* device number to flush */ > - u32 segments; /* # of segments to flush */ > -}; > - > -struct f2fs_sectrim_range { > - u64 start; > - u64 len; > - u64 flags; > -}; > - > /* for inline stuff */ > #define DEF_INLINE_RESERVED_SIZE 1 > static inline int get_extra_isize(struct inode *inode); > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index ee861c6d9ff0..d898f1e2764b 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -31,6 +31,7 @@ > #include "gc.h" > #include "trace.h" > #include > +#include > > static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) > { > diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h > index f8f1e85ff130..56b113e3cd6a 100644 > --- a/include/trace/events/f2fs.h > +++ b/include/trace/events/f2fs.h > @@ -6,6 +6,7 @@ > #define _TRACE_F2FS_H > > #include > +#include > > #define show_dev(dev) MAJOR(dev), MINOR(dev) > #define show_dev_ino(entry) show_dev(entry->dev), (unsigned long)entry->ino > diff --git a/include/uapi/linux/f2fs.h b/include/uapi/linux/f2fs.h > new file mode 100644 > index 000000000000..ad25786feaa1 > --- /dev/null > +++ b/include/uapi/linux/f2fs.h > @@ -0,0 +1,86 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +#ifndef _UAPI_LINUX_F2FS_H > +#define _UAPI_LINUX_F2FS_H > + > +#include > + > +/* > + * f2fs-specific ioctl commands > + */ > +#define F2FS_IOCTL_MAGIC 0xf5 > +#define F2FS_IOC_START_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 1) > +#define F2FS_IOC_COMMIT_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 2) > +#define F2FS_IOC_START_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 3) > +#define F2FS_IOC_RELEASE_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 4) > +#define F2FS_IOC_ABORT_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 5) > +#define F2FS_IOC_GARBAGE_COLLECT _IOW(F2FS_IOCTL_MAGIC, 6, __u32) > +#define F2FS_IOC_WRITE_CHECKPOINT _IO(F2FS_IOCTL_MAGIC, 7) > +#define F2FS_IOC_DEFRAGMENT _IOWR(F2FS_IOCTL_MAGIC, 8, \ > + struct f2fs_defragment) > +#define F2FS_IOC_MOVE_RANGE _IOWR(F2FS_IOCTL_MAGIC, 9, \ > + struct f2fs_move_range) > +#define F2FS_IOC_FLUSH_DEVICE _IOW(F2FS_IOCTL_MAGIC, 10, \ > + struct f2fs_flush_device) > +#define F2FS_IOC_GARBAGE_COLLECT_RANGE _IOW(F2FS_IOCTL_MAGIC, 11, \ > + struct f2fs_gc_range) > +#define F2FS_IOC_GET_FEATURES _IOR(F2FS_IOCTL_MAGIC, 12, __u32) > +#define F2FS_IOC_SET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 13, __u32) > +#define F2FS_IOC_GET_PIN_FILE _IOR(F2FS_IOCTL_MAGIC, 14, __u32) > +#define F2FS_IOC_PRECACHE_EXTENTS _IO(F2FS_IOCTL_MAGIC, 15) > +#define F2FS_IOC_RESIZE_FS _IOW(F2FS_IOCTL_MAGIC, 16, __u64) > +#define F2FS_IOC_GET_COMPRESS_BLOCKS _IOR(F2FS_IOCTL_MAGIC, 17, __u64) > +#define F2FS_IOC_RELEASE_COMPRESS_BLOCKS \ > + _IOR(F2FS_IOCTL_MAGIC, 18, __u64) > +#define F2FS_IOC_RESERVE_COMPRESS_BLOCKS \ > + _IOR(F2FS_IOCTL_MAGIC, 19, __u64) > +#define F2FS_IOC_SEC_TRIM_FILE _IOW(F2FS_IOCTL_MAGIC, 20, \ > + struct f2fs_sectrim_range) > + > +/* > + * should be same as XFS_IOC_GOINGDOWN. > + * Flags for going down operation used by FS_IOC_GOINGDOWN > + */ > +#define F2FS_IOC_SHUTDOWN _IOR('X', 125, __u32) /* Shutdown */ > +#define F2FS_GOING_DOWN_FULLSYNC 0x0 /* going down with full sync */ > +#define F2FS_GOING_DOWN_METASYNC 0x1 /* going down with metadata */ > +#define F2FS_GOING_DOWN_NOSYNC 0x2 /* going down */ > +#define F2FS_GOING_DOWN_METAFLUSH 0x3 /* going down with meta flush */ > +#define F2FS_GOING_DOWN_NEED_FSCK 0x4 /* going down to trigger fsck */ > + > +/* > + * Flags used by F2FS_IOC_SEC_TRIM_FILE > + */ > +#define F2FS_TRIM_FILE_DISCARD 0x1 /* send discard command */ > +#define F2FS_TRIM_FILE_ZEROOUT 0x2 /* zero out */ > +#define F2FS_TRIM_FILE_MASK 0x3 > + > +struct f2fs_gc_range { > + u32 sync; > + u64 start; > + u64 len; > +}; > + > +struct f2fs_defragment { > + u64 start; > + u64 len; > +}; > + > +struct f2fs_move_range { > + u32 dst_fd; /* destination fd */ > + u64 pos_in; /* start position in src_fd */ > + u64 pos_out; /* start position in dst_fd */ > + u64 len; /* size to move */ > +}; > + > +struct f2fs_flush_device { > + u32 dev_num; /* device number to flush */ > + u32 segments; /* # of segments to flush */ > +}; > + > +struct f2fs_sectrim_range { > + u64 start; > + u64 len; > + u64 flags; > +}; > + > +#endif /* _UAPI_LINUX_F2FS_H */ > -- > 2.26.2 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39FD2C00A89 for ; Fri, 30 Oct 2020 12:32:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C6B0C22210 for ; Fri, 30 Oct 2020 12:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604061125; bh=uAWtvTnGeRiAQGBeXWhiZ6TXWdrmX/qYwMYe3mrDHPk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=DIsGw7mTF5gRsdiDzpKZs9aW17a+uKcvF0vqC/f2ThMP4yBoZD8X2SybEiJVFlm0w 0HY2NDfv8R+XVkGBvemCH9oTY2UqmTvhThcukpK1elae3e8E2lg9PzYb2hHBJj4a1s ksmMM2BDEz0IjemGWLICP5Jo0QJogKclGMu1oieM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726667AbgJ3McE (ORCPT ); Fri, 30 Oct 2020 08:32:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:51880 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726055AbgJ3MbC (ORCPT ); Fri, 30 Oct 2020 08:31:02 -0400 Received: from google.com (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E7DB520731; Fri, 30 Oct 2020 12:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604061061; bh=uAWtvTnGeRiAQGBeXWhiZ6TXWdrmX/qYwMYe3mrDHPk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CBZTvoofelM4iQ+RhR13m5AOlKzbdlWmqdzG6DRERIpYia2MuTcE12Vx9G+UlskjD FbSEQ5MSFHn/sHO5CMEtlymrrw4PSjhuFIkzCbiDXwHJIG1R5dczaI3zxpmG930+7Z vqevVQfiuSD7ep30JWzzPQbUK+KT4gSJ3V3gSjtE= Date: Fri, 30 Oct 2020 05:30:59 -0700 From: Jaegeuk Kim To: Chao Yu Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, chao@kernel.org Subject: Re: [PATCH v2] f2fs: move ioctl interface definitions to separated file Message-ID: <20201030123059.GA1877745@google.com> References: <20201030072610.57155-1-yuchao0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201030072610.57155-1-yuchao0@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Chao, Can we make a documentation for this in f2fs.rst? Thanks, On 10/30, Chao Yu wrote: > Like other filesystem does, we introduce a new file f2fs.h in path of > include/uapi/linux/, and move f2fs-specified ioctl interface definitions > to that file, after then, in order to use those definitions, userspace > developer only need to include the new header file rather than > copy & paste definitions from fs/f2fs/f2fs.h. > > Signed-off-by: Chao Yu > --- > v2: add missing "WITH Linux-syscall-note" for SPDX-License-Identifier > MAINTAINERS | 1 + > fs/f2fs/f2fs.h | 79 ---------------------------------- > fs/f2fs/file.c | 1 + > include/trace/events/f2fs.h | 1 + > include/uapi/linux/f2fs.h | 86 +++++++++++++++++++++++++++++++++++++ > 5 files changed, 89 insertions(+), 79 deletions(-) > create mode 100644 include/uapi/linux/f2fs.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index d1d4e49a695a..b79a911f1e32 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6686,6 +6686,7 @@ F: Documentation/filesystems/f2fs.rst > F: fs/f2fs/ > F: include/linux/f2fs_fs.h > F: include/trace/events/f2fs.h > +F: include/uapi/linux/f2fs.h > > F71805F HARDWARE MONITORING DRIVER > M: Jean Delvare > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index cb700d797296..99bcf4b44a9c 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -402,85 +402,6 @@ static inline bool __has_cursum_space(struct f2fs_journal *journal, > return size <= MAX_SIT_JENTRIES(journal); > } > > -/* > - * f2fs-specific ioctl commands > - */ > -#define F2FS_IOCTL_MAGIC 0xf5 > -#define F2FS_IOC_START_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 1) > -#define F2FS_IOC_COMMIT_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 2) > -#define F2FS_IOC_START_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 3) > -#define F2FS_IOC_RELEASE_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 4) > -#define F2FS_IOC_ABORT_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 5) > -#define F2FS_IOC_GARBAGE_COLLECT _IOW(F2FS_IOCTL_MAGIC, 6, __u32) > -#define F2FS_IOC_WRITE_CHECKPOINT _IO(F2FS_IOCTL_MAGIC, 7) > -#define F2FS_IOC_DEFRAGMENT _IOWR(F2FS_IOCTL_MAGIC, 8, \ > - struct f2fs_defragment) > -#define F2FS_IOC_MOVE_RANGE _IOWR(F2FS_IOCTL_MAGIC, 9, \ > - struct f2fs_move_range) > -#define F2FS_IOC_FLUSH_DEVICE _IOW(F2FS_IOCTL_MAGIC, 10, \ > - struct f2fs_flush_device) > -#define F2FS_IOC_GARBAGE_COLLECT_RANGE _IOW(F2FS_IOCTL_MAGIC, 11, \ > - struct f2fs_gc_range) > -#define F2FS_IOC_GET_FEATURES _IOR(F2FS_IOCTL_MAGIC, 12, __u32) > -#define F2FS_IOC_SET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 13, __u32) > -#define F2FS_IOC_GET_PIN_FILE _IOR(F2FS_IOCTL_MAGIC, 14, __u32) > -#define F2FS_IOC_PRECACHE_EXTENTS _IO(F2FS_IOCTL_MAGIC, 15) > -#define F2FS_IOC_RESIZE_FS _IOW(F2FS_IOCTL_MAGIC, 16, __u64) > -#define F2FS_IOC_GET_COMPRESS_BLOCKS _IOR(F2FS_IOCTL_MAGIC, 17, __u64) > -#define F2FS_IOC_RELEASE_COMPRESS_BLOCKS \ > - _IOR(F2FS_IOCTL_MAGIC, 18, __u64) > -#define F2FS_IOC_RESERVE_COMPRESS_BLOCKS \ > - _IOR(F2FS_IOCTL_MAGIC, 19, __u64) > -#define F2FS_IOC_SEC_TRIM_FILE _IOW(F2FS_IOCTL_MAGIC, 20, \ > - struct f2fs_sectrim_range) > - > -/* > - * should be same as XFS_IOC_GOINGDOWN. > - * Flags for going down operation used by FS_IOC_GOINGDOWN > - */ > -#define F2FS_IOC_SHUTDOWN _IOR('X', 125, __u32) /* Shutdown */ > -#define F2FS_GOING_DOWN_FULLSYNC 0x0 /* going down with full sync */ > -#define F2FS_GOING_DOWN_METASYNC 0x1 /* going down with metadata */ > -#define F2FS_GOING_DOWN_NOSYNC 0x2 /* going down */ > -#define F2FS_GOING_DOWN_METAFLUSH 0x3 /* going down with meta flush */ > -#define F2FS_GOING_DOWN_NEED_FSCK 0x4 /* going down to trigger fsck */ > - > -/* > - * Flags used by F2FS_IOC_SEC_TRIM_FILE > - */ > -#define F2FS_TRIM_FILE_DISCARD 0x1 /* send discard command */ > -#define F2FS_TRIM_FILE_ZEROOUT 0x2 /* zero out */ > -#define F2FS_TRIM_FILE_MASK 0x3 > - > -struct f2fs_gc_range { > - u32 sync; > - u64 start; > - u64 len; > -}; > - > -struct f2fs_defragment { > - u64 start; > - u64 len; > -}; > - > -struct f2fs_move_range { > - u32 dst_fd; /* destination fd */ > - u64 pos_in; /* start position in src_fd */ > - u64 pos_out; /* start position in dst_fd */ > - u64 len; /* size to move */ > -}; > - > -struct f2fs_flush_device { > - u32 dev_num; /* device number to flush */ > - u32 segments; /* # of segments to flush */ > -}; > - > -struct f2fs_sectrim_range { > - u64 start; > - u64 len; > - u64 flags; > -}; > - > /* for inline stuff */ > #define DEF_INLINE_RESERVED_SIZE 1 > static inline int get_extra_isize(struct inode *inode); > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index ee861c6d9ff0..d898f1e2764b 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -31,6 +31,7 @@ > #include "gc.h" > #include "trace.h" > #include > +#include > > static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) > { > diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h > index f8f1e85ff130..56b113e3cd6a 100644 > --- a/include/trace/events/f2fs.h > +++ b/include/trace/events/f2fs.h > @@ -6,6 +6,7 @@ > #define _TRACE_F2FS_H > > #include > +#include > > #define show_dev(dev) MAJOR(dev), MINOR(dev) > #define show_dev_ino(entry) show_dev(entry->dev), (unsigned long)entry->ino > diff --git a/include/uapi/linux/f2fs.h b/include/uapi/linux/f2fs.h > new file mode 100644 > index 000000000000..ad25786feaa1 > --- /dev/null > +++ b/include/uapi/linux/f2fs.h > @@ -0,0 +1,86 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +#ifndef _UAPI_LINUX_F2FS_H > +#define _UAPI_LINUX_F2FS_H > + > +#include > + > +/* > + * f2fs-specific ioctl commands > + */ > +#define F2FS_IOCTL_MAGIC 0xf5 > +#define F2FS_IOC_START_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 1) > +#define F2FS_IOC_COMMIT_ATOMIC_WRITE _IO(F2FS_IOCTL_MAGIC, 2) > +#define F2FS_IOC_START_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 3) > +#define F2FS_IOC_RELEASE_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 4) > +#define F2FS_IOC_ABORT_VOLATILE_WRITE _IO(F2FS_IOCTL_MAGIC, 5) > +#define F2FS_IOC_GARBAGE_COLLECT _IOW(F2FS_IOCTL_MAGIC, 6, __u32) > +#define F2FS_IOC_WRITE_CHECKPOINT _IO(F2FS_IOCTL_MAGIC, 7) > +#define F2FS_IOC_DEFRAGMENT _IOWR(F2FS_IOCTL_MAGIC, 8, \ > + struct f2fs_defragment) > +#define F2FS_IOC_MOVE_RANGE _IOWR(F2FS_IOCTL_MAGIC, 9, \ > + struct f2fs_move_range) > +#define F2FS_IOC_FLUSH_DEVICE _IOW(F2FS_IOCTL_MAGIC, 10, \ > + struct f2fs_flush_device) > +#define F2FS_IOC_GARBAGE_COLLECT_RANGE _IOW(F2FS_IOCTL_MAGIC, 11, \ > + struct f2fs_gc_range) > +#define F2FS_IOC_GET_FEATURES _IOR(F2FS_IOCTL_MAGIC, 12, __u32) > +#define F2FS_IOC_SET_PIN_FILE _IOW(F2FS_IOCTL_MAGIC, 13, __u32) > +#define F2FS_IOC_GET_PIN_FILE _IOR(F2FS_IOCTL_MAGIC, 14, __u32) > +#define F2FS_IOC_PRECACHE_EXTENTS _IO(F2FS_IOCTL_MAGIC, 15) > +#define F2FS_IOC_RESIZE_FS _IOW(F2FS_IOCTL_MAGIC, 16, __u64) > +#define F2FS_IOC_GET_COMPRESS_BLOCKS _IOR(F2FS_IOCTL_MAGIC, 17, __u64) > +#define F2FS_IOC_RELEASE_COMPRESS_BLOCKS \ > + _IOR(F2FS_IOCTL_MAGIC, 18, __u64) > +#define F2FS_IOC_RESERVE_COMPRESS_BLOCKS \ > + _IOR(F2FS_IOCTL_MAGIC, 19, __u64) > +#define F2FS_IOC_SEC_TRIM_FILE _IOW(F2FS_IOCTL_MAGIC, 20, \ > + struct f2fs_sectrim_range) > + > +/* > + * should be same as XFS_IOC_GOINGDOWN. > + * Flags for going down operation used by FS_IOC_GOINGDOWN > + */ > +#define F2FS_IOC_SHUTDOWN _IOR('X', 125, __u32) /* Shutdown */ > +#define F2FS_GOING_DOWN_FULLSYNC 0x0 /* going down with full sync */ > +#define F2FS_GOING_DOWN_METASYNC 0x1 /* going down with metadata */ > +#define F2FS_GOING_DOWN_NOSYNC 0x2 /* going down */ > +#define F2FS_GOING_DOWN_METAFLUSH 0x3 /* going down with meta flush */ > +#define F2FS_GOING_DOWN_NEED_FSCK 0x4 /* going down to trigger fsck */ > + > +/* > + * Flags used by F2FS_IOC_SEC_TRIM_FILE > + */ > +#define F2FS_TRIM_FILE_DISCARD 0x1 /* send discard command */ > +#define F2FS_TRIM_FILE_ZEROOUT 0x2 /* zero out */ > +#define F2FS_TRIM_FILE_MASK 0x3 > + > +struct f2fs_gc_range { > + u32 sync; > + u64 start; > + u64 len; > +}; > + > +struct f2fs_defragment { > + u64 start; > + u64 len; > +}; > + > +struct f2fs_move_range { > + u32 dst_fd; /* destination fd */ > + u64 pos_in; /* start position in src_fd */ > + u64 pos_out; /* start position in dst_fd */ > + u64 len; /* size to move */ > +}; > + > +struct f2fs_flush_device { > + u32 dev_num; /* device number to flush */ > + u32 segments; /* # of segments to flush */ > +}; > + > +struct f2fs_sectrim_range { > + u64 start; > + u64 len; > + u64 flags; > +}; > + > +#endif /* _UAPI_LINUX_F2FS_H */ > -- > 2.26.2