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

Commit e63e88bc authored Aug 02, 2016 by Ryusuke Konishi Committed by Linus Torvalds Aug 02, 2016

nilfs2: move ioctl interface and disk layout to uapi separately

The header file "include/linux/nilfs2_fs.h" is composed of parts for
ioctl and disk format, and both are intended to be shared with user
space programs.

This moves them to the uapi directory "include/uapi/linux" splitting the
file to "nilfs2_api.h" and "nilfs2_ondisk.h".  The following minor
changes are accompanied by this migration:

 - nilfs_direct_node struct in nilfs2/direct.h is converged to
   nilfs2_ondisk.h because it's an on-disk structure.
 - inline functions nilfs_rec_len_from_disk() and
   nilfs_rec_len_to_disk() are moved to nilfs2/dir.c.

Link: http://lkml.kernel.org/r/1465825507-3407-4-git-send-email-konishi.ryusuke@lab.ntt.co.jp


Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4ce5c342

Documentation/filesystems/nilfs2.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -267,7 +267,8 @@ among NILFS2 files can be depicted as follows:
	`-- file (ino=yy)		`-- file (ino=yy)
	( regular file, directory, or symlink )		( regular file, directory, or symlink )

	For detail on the format of each file, please see include/linux/nilfs2_fs.h.		For detail on the format of each file, please see nilfs2_ondisk.h
			located at include/uapi/linux directory.

	There are no patents or other intellectual property that we protect		There are no patents or other intellectual property that we protect
	with regard to the design of NILFS2. It is allowed to replicate the		with regard to the design of NILFS2. It is allowed to replicate the

Documentation/ioctl/ioctl-number.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -248,7 +248,7 @@ Code Seq#(hex) Include File Comments
	'm' 00 drivers/scsi/megaraid/megaraid_ioctl.h conflict!		'm' 00 drivers/scsi/megaraid/megaraid_ioctl.h conflict!
	'm' 00-1F net/irda/irmod.h conflict!		'm' 00-1F net/irda/irmod.h conflict!
	'n' 00-7F linux/ncp_fs.h and fs/ncpfs/ioctl.c		'n' 00-7F linux/ncp_fs.h and fs/ncpfs/ioctl.c
	'n' 80-8F linux/nilfs2_fs.h NILFS2		'n' 80-8F uapi/linux/nilfs2_api.h NILFS2
	'n' E0-FF linux/matroxfb.h matroxfb		'n' E0-FF linux/matroxfb.h matroxfb
	'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2		'o' 00-1F fs/ocfs2/ocfs2_fs.h OCFS2
	'o' 00-03 mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps)		'o' 00-03 mtd/ubi-user.h conflict! (OCFS2 and UBI overlaps)

MAINTAINERS

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8258,8 +8258,9 @@ T: git git://github.com/konis/nilfs2.git
	S: Supported		S: Supported
	F: Documentation/filesystems/nilfs2.txt		F: Documentation/filesystems/nilfs2.txt
	F: fs/nilfs2/		F: fs/nilfs2/
	F: include/linux/nilfs2_fs.h
	F: include/trace/events/nilfs2.h		F: include/trace/events/nilfs2.h
			F: include/uapi/linux/nilfs2_api.h
			F: include/uapi/linux/nilfs2_ondisk.h

	NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER		NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
	M: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>		M: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>

fs/nilfs2/bmap.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/fs.h>		#include <linux/fs.h>
	#include <linux/buffer_head.h>		#include <linux/buffer_head.h>
	#include <linux/nilfs2_fs.h>		#include <linux/nilfs2_ondisk.h> /* nilfs_binfo, nilfs_inode, etc */
	#include "alloc.h"		#include "alloc.h"
	#include "dat.h"		#include "dat.h"

fs/nilfs2/btree.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/buffer_head.h>		#include <linux/buffer_head.h>
	#include <linux/list.h>		#include <linux/list.h>
	#include <linux/nilfs2_fs.h>		#include <linux/nilfs2_ondisk.h> /* nilfs_btree_node */
	#include "btnode.h"		#include "btnode.h"
	#include "bmap.h"		#include "bmap.h"