Merge branch 'mnt_devname' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (054cfaac) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/filesystems/Locking

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -166,13 +166,11 @@ prototypes:
	void (kill_sb) (struct super_block );		void (kill_sb) (struct super_block );
	locking rules:		locking rules:
	may block		may block
	get_sb yes
	mount yes		mount yes
	kill_sb yes		kill_sb yes

	->get_sb() returns error or 0 with locked superblock attached to the vfsmount		->mount() returns ERR_PTR or the root dentry; its superblock should be locked
	(exclusive on ->s_umount).		on return.
	->mount() returns ERR_PTR or the root dentry.
	->kill_sb() takes a write-locked superblock, does all shutdown work on it,		->kill_sb() takes a write-locked superblock, does all shutdown work on it,
	unlocks and drops the reference.		unlocks and drops the reference.

Documentation/filesystems/porting

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -394,3 +394,10 @@ file) you must return -EOPNOTSUPP if FALLOC_FL_PUNCH_HOLE is set in mode.
	Currently you can only have FALLOC_FL_PUNCH_HOLE with FALLOC_FL_KEEP_SIZE set,		Currently you can only have FALLOC_FL_PUNCH_HOLE with FALLOC_FL_KEEP_SIZE set,
	so the i_size should not change when hole punching, even when puching the end of		so the i_size should not change when hole punching, even when puching the end of
	a file off.		a file off.

			--
			[mandatory]
			->get_sb() is gone. Switch to use of ->mount(). Typically it's just
			a matter of switching from calling get_sb_... to mount_... and changing the
			function type. If you were doing it manually, just switch from setting ->mnt_root
			to some pointer to returning that pointer. On errors return ERR_PTR(...).

Documentation/filesystems/vfs.txt

+32 −24

Original line number	Original line	Diff line number	Diff line
	@@ -95,10 +95,11 @@ functions:
	extern int unregister_filesystem(struct file_system_type *);		extern int unregister_filesystem(struct file_system_type *);

	The passed struct file_system_type describes your filesystem. When a		The passed struct file_system_type describes your filesystem. When a
	request is made to mount a device onto a directory in your filespace,		request is made to mount a filesystem onto a directory in your namespace,
	the VFS will call the appropriate get_sb() method for the specific		the VFS will call the appropriate mount() method for the specific
	filesystem. The dentry for the mount point will then be updated to		filesystem. New vfsmount refering to the tree returned by ->mount()
	point to the root inode for the new filesystem.		will be attached to the mountpoint, so that when pathname resolution
			reaches the mountpoint it will jump into the root of that vfsmount.

	You can see all filesystems that are registered to the kernel in the		You can see all filesystems that are registered to the kernel in the
	file /proc/filesystems.		file /proc/filesystems.
	@@ -107,14 +108,14 @@ file /proc/filesystems.
	struct file_system_type		struct file_system_type
	-----------------------		-----------------------

	This describes the filesystem. As of kernel 2.6.22, the following		This describes the filesystem. As of kernel 2.6.39, the following
	members are defined:		members are defined:

	struct file_system_type {		struct file_system_type {
	const char *name;		const char *name;
	int fs_flags;		int fs_flags;
	int (get_sb) (struct file_system_type , int,		struct dentry (mount) (struct file_system_type , int,
	const char , void , struct vfsmount *);		const char , void );
	void (kill_sb) (struct super_block );		void (kill_sb) (struct super_block );
	struct module *owner;		struct module *owner;
	struct file_system_type * next;		struct file_system_type * next;
	@@ -128,11 +129,11 @@ struct file_system_type {

	fs_flags: various flags (i.e. FS_REQUIRES_DEV, FS_NO_DCACHE, etc.)		fs_flags: various flags (i.e. FS_REQUIRES_DEV, FS_NO_DCACHE, etc.)

	get_sb: the method to call when a new instance of this		mount: the method to call when a new instance of this
	filesystem should be mounted		filesystem should be mounted

	kill_sb: the method to call when an instance of this filesystem		kill_sb: the method to call when an instance of this filesystem
	should be unmounted		should be shut down

	owner: for internal VFS use: you should initialize this to THIS_MODULE in		owner: for internal VFS use: you should initialize this to THIS_MODULE in
	most cases.		most cases.
	@@ -141,7 +142,7 @@ struct file_system_type {

	s_lock_key, s_umount_key: lockdep-specific		s_lock_key, s_umount_key: lockdep-specific

	The get_sb() method has the following arguments:		The mount() method has the following arguments:

	struct file_system_type *fs_type: describes the filesystem, partly initialized		struct file_system_type *fs_type: describes the filesystem, partly initialized
	by the specific filesystem code		by the specific filesystem code
	@@ -153,32 +154,39 @@ The get_sb() method has the following arguments:
	void *data: arbitrary mount options, usually comes as an ASCII		void *data: arbitrary mount options, usually comes as an ASCII
	string (see "Mount Options" section)		string (see "Mount Options" section)

	struct vfsmount *mnt: a vfs-internal representation of a mount point		The mount() method must return the root dentry of the tree requested by
			caller. An active reference to its superblock must be grabbed and the
			superblock must be locked. On failure it should return ERR_PTR(error).

	The get_sb() method must determine if the block device specified		The arguments match those of mount(2) and their interpretation
	in the dev_name and fs_type contains a filesystem of the type the method		depends on filesystem type. E.g. for block filesystems, dev_name is
	supports. If it succeeds in opening the named block device, it initializes a		interpreted as block device name, that device is opened and if it
	struct super_block descriptor for the filesystem contained by the block device.		contains a suitable filesystem image the method creates and initializes
	On failure it returns an error.		struct super_block accordingly, returning its root dentry to caller.

			->mount() may choose to return a subtree of existing filesystem - it
			doesn't have to create a new one. The main result from the caller's
			point of view is a reference to dentry at the root of (sub)tree to
			be attached; creation of new superblock is a common side effect.

	The most interesting member of the superblock structure that the		The most interesting member of the superblock structure that the
	get_sb() method fills in is the "s_op" field. This is a pointer to		mount() method fills in is the "s_op" field. This is a pointer to
	a "struct super_operations" which describes the next level of the		a "struct super_operations" which describes the next level of the
	filesystem implementation.		filesystem implementation.

	Usually, a filesystem uses one of the generic get_sb() implementations		Usually, a filesystem uses one of the generic mount() implementations
	and provides a fill_super() method instead. The generic methods are:		and provides a fill_super() callback instead. The generic variants are:

	get_sb_bdev: mount a filesystem residing on a block device		mount_bdev: mount a filesystem residing on a block device

	get_sb_nodev: mount a filesystem that is not backed by a device		mount_nodev: mount a filesystem that is not backed by a device

	get_sb_single: mount a filesystem which shares the instance between		mount_single: mount a filesystem which shares the instance between
	all mounts		all mounts

	A fill_super() method implementation has the following arguments:		A fill_super() callback implementation has the following arguments:

	struct super_block *sb: the superblock structure. The method fill_super()		struct super_block *sb: the superblock structure. The callback
	must initialize this properly.		must initialize this properly.

	void *data: arbitrary mount options, usually comes as an ASCII		void *data: arbitrary mount options, usually comes as an ASCII

fs/namespace.c

+30 −9

Original line number	Original line	Diff line number	Diff line
	@@ -978,7 +978,13 @@ static int show_vfsmnt(struct seq_file m, void v)
	int err = 0;		int err = 0;
	struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };		struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt };

			if (mnt->mnt_sb->s_op->show_devname) {
			err = mnt->mnt_sb->s_op->show_devname(m, mnt);
			if (err)
			goto out;
			} else {
	mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");		mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
			}
	seq_putc(m, ' ');		seq_putc(m, ' ');
	seq_path(m, &mnt_path, " \t\n\\");		seq_path(m, &mnt_path, " \t\n\\");
	seq_putc(m, ' ');		seq_putc(m, ' ');
	@@ -1025,7 +1031,12 @@ static int show_mountinfo(struct seq_file m, void v)

	seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,		seq_printf(m, "%i %i %u:%u ", mnt->mnt_id, mnt->mnt_parent->mnt_id,
	MAJOR(sb->s_dev), MINOR(sb->s_dev));		MAJOR(sb->s_dev), MINOR(sb->s_dev));
			if (sb->s_op->show_path)
			err = sb->s_op->show_path(m, mnt);
			else
	seq_dentry(m, mnt->mnt_root, " \t\n\\");		seq_dentry(m, mnt->mnt_root, " \t\n\\");
			if (err)
			goto out;
	seq_putc(m, ' ');		seq_putc(m, ' ');
	seq_path_root(m, &mnt_path, &root, " \t\n\\");		seq_path_root(m, &mnt_path, &root, " \t\n\\");
	if (root.mnt != p->root.mnt \|\| root.dentry != p->root.dentry) {		if (root.mnt != p->root.mnt \|\| root.dentry != p->root.dentry) {
	@@ -1060,7 +1071,12 @@ static int show_mountinfo(struct seq_file m, void v)
	seq_puts(m, " - ");		seq_puts(m, " - ");
	show_type(m, sb);		show_type(m, sb);
	seq_putc(m, ' ');		seq_putc(m, ' ');
			if (sb->s_op->show_devname)
			err = sb->s_op->show_devname(m, mnt);
			else
	mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");		mangle(m, mnt->mnt_devname ? mnt->mnt_devname : "none");
			if (err)
			goto out;
	seq_puts(m, sb->s_flags & MS_RDONLY ? " ro" : " rw");		seq_puts(m, sb->s_flags & MS_RDONLY ? " ro" : " rw");
	err = show_sb_opts(m, sb);		err = show_sb_opts(m, sb);
	if (err)		if (err)
	@@ -1086,11 +1102,15 @@ static int show_vfsstat(struct seq_file m, void v)
	int err = 0;		int err = 0;

	/* device */		/* device */
			if (mnt->mnt_sb->s_op->show_devname) {
			err = mnt->mnt_sb->s_op->show_devname(m, mnt);
			} else {
	if (mnt->mnt_devname) {		if (mnt->mnt_devname) {
	seq_puts(m, "device ");		seq_puts(m, "device ");
	mangle(m, mnt->mnt_devname);		mangle(m, mnt->mnt_devname);
	} else		} else
	seq_puts(m, "no device");		seq_puts(m, "no device");
			}

	/* mount point */		/* mount point */
	seq_puts(m, " mounted on ");		seq_puts(m, " mounted on ");
	@@ -1104,6 +1124,7 @@ static int show_vfsstat(struct seq_file m, void v)
	/* optional statistics */		/* optional statistics */
	if (mnt->mnt_sb->s_op->show_stats) {		if (mnt->mnt_sb->s_op->show_stats) {
	seq_putc(m, ' ');		seq_putc(m, ' ');
			if (!err)
	err = mnt->mnt_sb->s_op->show_stats(m, mnt);		err = mnt->mnt_sb->s_op->show_stats(m, mnt);
	}		}

fs/nfs/dir.c

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1169,11 +1169,23 @@ static void nfs_dentry_iput(struct dentry dentry, struct inode inode)
	iput(inode);		iput(inode);
	}		}

			static void nfs_d_release(struct dentry *dentry)
			{
			/* free cached devname value, if it survived that far */
			if (unlikely(dentry->d_fsdata)) {
			if (dentry->d_flags & DCACHE_NFSFS_RENAMED)
			WARN_ON(1);
			else
			kfree(dentry->d_fsdata);
			}
			}

	const struct dentry_operations nfs_dentry_operations = {		const struct dentry_operations nfs_dentry_operations = {
	.d_revalidate = nfs_lookup_revalidate,		.d_revalidate = nfs_lookup_revalidate,
	.d_delete = nfs_dentry_delete,		.d_delete = nfs_dentry_delete,
	.d_iput = nfs_dentry_iput,		.d_iput = nfs_dentry_iput,
	.d_automount = nfs_d_automount,		.d_automount = nfs_d_automount,
			.d_release = nfs_d_release,
	};		};

	static struct dentry nfs_lookup(struct inode dir, struct dentry * dentry, struct nameidata *nd)		static struct dentry nfs_lookup(struct inode dir, struct dentry * dentry, struct nameidata *nd)
	@@ -1248,6 +1260,7 @@ const struct dentry_operations nfs4_dentry_operations = {
	.d_delete = nfs_dentry_delete,		.d_delete = nfs_dentry_delete,
	.d_iput = nfs_dentry_iput,		.d_iput = nfs_dentry_iput,
	.d_automount = nfs_d_automount,		.d_automount = nfs_d_automount,
			.d_release = nfs_d_release,
	};		};

	/*		/*