2005-04-17 00:20:36 +02:00
|
|
|
/*
|
|
|
|
* linux/fs/super.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
*
|
|
|
|
* super.c contains code to handle: - mount structures
|
|
|
|
* - super-block tables
|
|
|
|
* - filesystem drivers list
|
|
|
|
* - mount system call
|
|
|
|
* - umount system call
|
|
|
|
* - ustat system call
|
|
|
|
*
|
|
|
|
* GK 2/5/95 - Changed to support mounting the root fs via NFS
|
|
|
|
*
|
|
|
|
* Added kerneld support: Jacques Gelinas and Bjorn Ekwall
|
|
|
|
* Added change_root: Werner Almesberger & Hans Lermen, Feb '96
|
|
|
|
* Added options to /proc/mounts:
|
2007-10-19 23:21:04 +02:00
|
|
|
* Torbjörn Lindh (torbjorn.lindh@gopta.se), April 14, 1996.
|
2005-04-17 00:20:36 +02:00
|
|
|
* Added devfs support: Richard Gooch <rgooch@atnf.csiro.au>, 13-JAN-1998
|
|
|
|
* Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/smp_lock.h>
|
|
|
|
#include <linux/acct.h>
|
|
|
|
#include <linux/blkdev.h>
|
|
|
|
#include <linux/quotaops.h>
|
|
|
|
#include <linux/namei.h>
|
|
|
|
#include <linux/mount.h>
|
|
|
|
#include <linux/security.h>
|
|
|
|
#include <linux/syscalls.h>
|
|
|
|
#include <linux/vfs.h>
|
|
|
|
#include <linux/writeback.h> /* for the emergency remount stuff */
|
|
|
|
#include <linux/idr.h>
|
|
|
|
#include <linux/kobject.h>
|
2006-03-26 11:37:12 +02:00
|
|
|
#include <linux/mutex.h>
|
2008-02-15 23:37:32 +01:00
|
|
|
#include <linux/file.h>
|
2010-04-29 20:33:35 +02:00
|
|
|
#include <linux/backing-dev.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <asm/uaccess.h>
|
2008-03-22 20:48:17 +01:00
|
|
|
#include "internal.h"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
|
|
|
|
LIST_HEAD(super_blocks);
|
|
|
|
DEFINE_SPINLOCK(sb_lock);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* alloc_super - create new superblock
|
2006-09-06 09:03:41 +02:00
|
|
|
* @type: filesystem type superblock should belong to
|
2005-04-17 00:20:36 +02:00
|
|
|
*
|
|
|
|
* Allocates and initializes a new &struct super_block. alloc_super()
|
|
|
|
* returns a pointer new superblock or %NULL if allocation had failed.
|
|
|
|
*/
|
2006-07-03 09:25:27 +02:00
|
|
|
static struct super_block *alloc_super(struct file_system_type *type)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2006-03-25 12:08:13 +01:00
|
|
|
struct super_block *s = kzalloc(sizeof(struct super_block), GFP_USER);
|
2009-09-22 02:01:09 +02:00
|
|
|
static const struct super_operations default_op;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (s) {
|
|
|
|
if (security_sb_alloc(s)) {
|
|
|
|
kfree(s);
|
|
|
|
s = NULL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
INIT_LIST_HEAD(&s->s_files);
|
|
|
|
INIT_LIST_HEAD(&s->s_instances);
|
|
|
|
INIT_HLIST_HEAD(&s->s_anon);
|
|
|
|
INIT_LIST_HEAD(&s->s_inodes);
|
fix soft lock up at NFS mount via per-SB LRU-list of unused dentries
[Summary]
Split LRU-list of unused dentries to one per superblock to avoid soft
lock up during NFS mounts and remounting of any filesystem.
Previously I posted here:
http://lkml.org/lkml/2008/3/5/590
[Descriptions]
- background
dentry_unused is a list of dentries which are not referenced.
dentry_unused grows up when references on directories or files are
released. This list can be very long if there is huge free memory.
- the problem
When shrink_dcache_sb() is called, it scans all dentry_unused linearly
under spin_lock(), and if dentry->d_sb is differnt from given
superblock, scan next dentry. This scan costs very much if there are
many entries, and very ineffective if there are many superblocks.
IOW, When we need to shrink unused dentries on one dentry, but scans
unused dentries on all superblocks in the system. For example, we scan
500 dentries to unmount a filesystem, but scans 1,000,000 or more unused
dentries on other superblocks.
In our case , At mounting NFS*, shrink_dcache_sb() is called to shrink
unused dentries on NFS, but scans 100,000,000 unused dentries on
superblocks in the system such as local ext3 filesystems. I hear NFS
mounting took 1 min on some system in use.
* : NFS uses virtual filesystem in rpc layer, so NFS is affected by
this problem.
100,000,000 is possible number on large systems.
Per-superblock LRU of unused dentried can reduce the cost in
reasonable manner.
- How to fix
I found this problem is solved by David Chinner's "Per-superblock
unused dentry LRU lists V3"(1), so I rebase it and add some fix to
reclaim with fairness, which is in Andrew Morton's comments(2).
1) http://lkml.org/lkml/2006/5/25/318
2) http://lkml.org/lkml/2006/5/25/320
Split LRU-list of unused dentries to each superblocks. Then, NFS
mounting will check dentries under a superblock instead of all. But
this spliting will break LRU of dentry-unused. So, I've attempted to
make reclaim unused dentrins with fairness by calculate number of
dentries to scan on this sb based on following way
number of dentries to scan on this sb =
count * (number of dentries on this sb / number of dentries in the machine)
- ToDo
- I have to measuring performance number and do stress tests.
- When unmount occurs during prune_dcache(), scanning on same
superblock, It is unable to reach next superblock because it is gone
away. We restart scannig superblock from first one, it causes
unfairness of reclaim unused dentries on first superblock. But I think
this happens very rarely.
- Test Results
Result on 6GB boxes with excessive unused dentries.
Without patch:
$ cat /proc/sys/fs/dentry-state
10181835 10180203 45 0 0 0
# mount -t nfs 10.124.60.70:/work/kernel-src nfs
real 0m1.830s
user 0m0.001s
sys 0m1.653s
With this patch:
$ cat /proc/sys/fs/dentry-state
10236610 10234751 45 0 0 0
# mount -t nfs 10.124.60.70:/work/kernel-src nfs
real 0m0.106s
user 0m0.002s
sys 0m0.032s
[akpm@linux-foundation.org: fix comments]
Signed-off-by: Kentaro Makita <k-makita@np.css.fujitsu.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: David Chinner <dgc@sgi.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-24 06:27:13 +02:00
|
|
|
INIT_LIST_HEAD(&s->s_dentry_lru);
|
2005-04-17 00:20:36 +02:00
|
|
|
init_rwsem(&s->s_umount);
|
2006-01-10 00:59:25 +01:00
|
|
|
mutex_init(&s->s_lock);
|
2006-07-03 09:25:28 +02:00
|
|
|
lockdep_set_class(&s->s_umount, &type->s_umount_key);
|
2006-07-03 09:25:27 +02:00
|
|
|
/*
|
|
|
|
* The locking rules for s_lock are up to the
|
|
|
|
* filesystem. For example ext3fs has different
|
|
|
|
* lock ordering than usbfs:
|
|
|
|
*/
|
|
|
|
lockdep_set_class(&s->s_lock, &type->s_lock_key);
|
fs/super.c: add lockdep annotation to s_umount
Li Zefan said:
Thread 1:
for ((; ;))
{
mount -t cpuset xxx /mnt > /dev/null 2>&1
cat /mnt/cpus > /dev/null 2>&1
umount /mnt > /dev/null 2>&1
}
Thread 2:
for ((; ;))
{
mount -t cpuset xxx /mnt > /dev/null 2>&1
umount /mnt > /dev/null 2>&1
}
(Note: It is irrelevant which cgroup subsys is used.)
After a while a lockdep warning showed up:
=============================================
[ INFO: possible recursive locking detected ]
2.6.28 #479
---------------------------------------------
mount/13554 is trying to acquire lock:
(&type->s_umount_key#19){--..}, at: [<c049d888>] sget+0x5e/0x321
but task is already holding lock:
(&type->s_umount_key#19){--..}, at: [<c049da0c>] sget+0x1e2/0x321
other info that might help us debug this:
1 lock held by mount/13554:
#0: (&type->s_umount_key#19){--..}, at: [<c049da0c>] sget+0x1e2/0x321
stack backtrace:
Pid: 13554, comm: mount Not tainted 2.6.28-mc #479
Call Trace:
[<c044ad2e>] validate_chain+0x4c6/0xbbd
[<c044ba9b>] __lock_acquire+0x676/0x700
[<c044bb82>] lock_acquire+0x5d/0x7a
[<c049d888>] ? sget+0x5e/0x321
[<c061b9b8>] down_write+0x34/0x50
[<c049d888>] ? sget+0x5e/0x321
[<c049d888>] sget+0x5e/0x321
[<c045a2e7>] ? cgroup_set_super+0x0/0x3e
[<c045959f>] ? cgroup_test_super+0x0/0x2f
[<c045bcea>] cgroup_get_sb+0x98/0x2e7
[<c045cfb6>] cpuset_get_sb+0x4a/0x5f
[<c049dfa4>] vfs_kern_mount+0x40/0x7b
[<c049e02d>] do_kern_mount+0x37/0xbf
[<c04af4a0>] do_mount+0x5c3/0x61a
[<c04addd2>] ? copy_mount_options+0x2c/0x111
[<c04af560>] sys_mount+0x69/0xa0
[<c0403251>] sysenter_do_call+0x12/0x31
The cause is after alloc_super() and then retry, an old entry in list
fs_supers is found, so grab_super(old) is called, but both functions hold
s_umount lock:
struct super_block *sget(...)
{
...
retry:
spin_lock(&sb_lock);
if (test) {
list_for_each_entry(old, &type->fs_supers, s_instances) {
if (!test(old, data))
continue;
if (!grab_super(old)) <--- 2nd: down_write(&old->s_umount);
goto retry;
if (s)
destroy_super(s);
return old;
}
}
if (!s) {
spin_unlock(&sb_lock);
s = alloc_super(type); <--- 1th: down_write(&s->s_umount)
if (!s)
return ERR_PTR(-ENOMEM);
goto retry;
}
...
}
It seems like a false positive, and seems like VFS but not cgroup needs to
be fixed.
Peter said:
We can simply put the new s_umount instance in a but lockdep doesn't
particularly cares about subclass order.
If there's any issue with the callers of sget() assuming the s_umount lock
being of sublcass 0, then there is another annotation we can use to fix
that, but lets not bother with that if this is sufficient.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12673
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Tested-by: Li Zefan <lizf@cn.fujitsu.com>
Reported-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Paul Menage <menage@google.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-02-18 23:48:30 +01:00
|
|
|
/*
|
|
|
|
* sget() can have s_umount recursion.
|
|
|
|
*
|
|
|
|
* When it cannot find a suitable sb, it allocates a new
|
|
|
|
* one (this one), and tries again to find a suitable old
|
|
|
|
* one.
|
|
|
|
*
|
|
|
|
* In case that succeeds, it will acquire the s_umount
|
|
|
|
* lock of the old one. Since these are clearly distrinct
|
|
|
|
* locks, and this object isn't exposed yet, there's no
|
|
|
|
* risk of deadlocks.
|
|
|
|
*
|
|
|
|
* Annotate this by putting this lock in a different
|
|
|
|
* subclass.
|
|
|
|
*/
|
|
|
|
down_write_nested(&s->s_umount, SINGLE_DEPTH_NESTING);
|
2010-03-22 13:53:19 +01:00
|
|
|
s->s_count = 1;
|
2005-04-17 00:20:36 +02:00
|
|
|
atomic_set(&s->s_active, 1);
|
2006-03-23 12:00:33 +01:00
|
|
|
mutex_init(&s->s_vfs_rename_mutex);
|
2006-03-23 12:00:29 +01:00
|
|
|
mutex_init(&s->s_dquot.dqio_mutex);
|
|
|
|
mutex_init(&s->s_dquot.dqonoff_mutex);
|
2005-04-17 00:20:36 +02:00
|
|
|
init_rwsem(&s->s_dquot.dqptr_sem);
|
|
|
|
init_waitqueue_head(&s->s_wait_unfrozen);
|
|
|
|
s->s_maxbytes = MAX_NON_LFS;
|
|
|
|
s->dq_op = sb_dquot_ops;
|
|
|
|
s->s_qcop = sb_quotactl_ops;
|
|
|
|
s->s_op = &default_op;
|
|
|
|
s->s_time_gran = 1000000000;
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* destroy_super - frees a superblock
|
|
|
|
* @s: superblock to free
|
|
|
|
*
|
|
|
|
* Frees a superblock.
|
|
|
|
*/
|
|
|
|
static inline void destroy_super(struct super_block *s)
|
|
|
|
{
|
|
|
|
security_sb_free(s);
|
add filesystem subtype support
There's a slight problem with filesystem type representation in fuse
based filesystems.
From the kernel's view, there are just two filesystem types: fuse and
fuseblk. From the user's view there are lots of different filesystem
types. The user is not even much concerned if the filesystem is fuse based
or not. So there's a conflict of interest in how this should be
represented in fstab, mtab and /proc/mounts.
The current scheme is to encode the real filesystem type in the mount
source. So an sshfs mount looks like this:
sshfs#user@server:/ /mnt/server fuse rw,nosuid,nodev,...
This url-ish syntax works OK for sshfs and similar filesystems. However
for block device based filesystems (ntfs-3g, zfs) it doesn't work, since
the kernel expects the mount source to be a real device name.
A possibly better scheme would be to encode the real type in the type
field as "type.subtype". So fuse mounts would look like this:
/dev/hda1 /mnt/windows fuseblk.ntfs-3g rw,...
user@server:/ /mnt/server fuse.sshfs rw,nosuid,nodev,...
This patch adds the necessary code to the kernel so that this can be
correctly displayed in /proc/mounts.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 09:25:43 +02:00
|
|
|
kfree(s->s_subtype);
|
2008-02-08 13:21:35 +01:00
|
|
|
kfree(s->s_options);
|
2005-04-17 00:20:36 +02:00
|
|
|
kfree(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Superblock refcounting */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Drop a superblock's refcount. Returns non-zero if the superblock was
|
|
|
|
* destroyed. The caller must hold sb_lock.
|
|
|
|
*/
|
2010-03-23 00:56:42 +01:00
|
|
|
int __put_super(struct super_block *sb)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (!--sb->s_count) {
|
2010-03-23 00:36:35 +01:00
|
|
|
list_del_init(&sb->s_list);
|
2005-04-17 00:20:36 +02:00
|
|
|
destroy_super(sb);
|
|
|
|
ret = 1;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Drop a superblock's refcount.
|
|
|
|
* Returns non-zero if the superblock is about to be destroyed and
|
|
|
|
* at least is already removed from super_blocks list, so if we are
|
|
|
|
* making a loop through super blocks then we need to restart.
|
|
|
|
* The caller must hold sb_lock.
|
|
|
|
*/
|
|
|
|
int __put_super_and_need_restart(struct super_block *sb)
|
|
|
|
{
|
|
|
|
/* check for race with generic_shutdown_super() */
|
2010-03-23 00:36:35 +01:00
|
|
|
if (list_empty(&sb->s_instances)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
/* super block is removed, need to restart... */
|
|
|
|
__put_super(sb);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* can't be the last, since s_list is still in use */
|
|
|
|
sb->s_count--;
|
|
|
|
BUG_ON(sb->s_count == 0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* put_super - drop a temporary reference to superblock
|
|
|
|
* @sb: superblock in question
|
|
|
|
*
|
|
|
|
* Drops a temporary reference, frees superblock if there's no
|
|
|
|
* references left.
|
|
|
|
*/
|
2009-09-09 09:08:54 +02:00
|
|
|
void put_super(struct super_block *sb)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
spin_lock(&sb_lock);
|
|
|
|
__put_super(sb);
|
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2010-03-22 20:22:31 +01:00
|
|
|
* deactivate_locked_super - drop an active reference to superblock
|
2005-04-17 00:20:36 +02:00
|
|
|
* @s: superblock to deactivate
|
|
|
|
*
|
2010-03-22 20:22:31 +01:00
|
|
|
* Drops an active reference to superblock, converting it into a temprory
|
|
|
|
* one if there is no other active references left. In that case we
|
2005-04-17 00:20:36 +02:00
|
|
|
* tell fs driver to shut it down and drop the temporary reference we
|
|
|
|
* had just acquired.
|
2010-03-22 20:22:31 +01:00
|
|
|
*
|
|
|
|
* Caller holds exclusive lock on superblock; that lock is released.
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
2010-03-22 20:22:31 +01:00
|
|
|
void deactivate_locked_super(struct super_block *s)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct file_system_type *fs = s->s_type;
|
2010-03-22 13:53:19 +01:00
|
|
|
if (atomic_dec_and_test(&s->s_active)) {
|
2009-01-26 16:45:12 +01:00
|
|
|
vfs_dq_off(s, 0);
|
2005-04-17 00:20:36 +02:00
|
|
|
fs->kill_sb(s);
|
|
|
|
put_filesystem(fs);
|
|
|
|
put_super(s);
|
2010-03-22 20:22:31 +01:00
|
|
|
} else {
|
|
|
|
up_write(&s->s_umount);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-22 20:22:31 +01:00
|
|
|
EXPORT_SYMBOL(deactivate_locked_super);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-05-06 07:07:50 +02:00
|
|
|
/**
|
2010-03-22 20:22:31 +01:00
|
|
|
* deactivate_super - drop an active reference to superblock
|
2009-05-06 07:07:50 +02:00
|
|
|
* @s: superblock to deactivate
|
|
|
|
*
|
2010-03-22 20:22:31 +01:00
|
|
|
* Variant of deactivate_locked_super(), except that superblock is *not*
|
|
|
|
* locked by caller. If we are going to drop the final active reference,
|
|
|
|
* lock will be acquired prior to that.
|
2009-05-06 07:07:50 +02:00
|
|
|
*/
|
2010-03-22 20:22:31 +01:00
|
|
|
void deactivate_super(struct super_block *s)
|
2009-05-06 07:07:50 +02:00
|
|
|
{
|
2010-03-22 20:22:31 +01:00
|
|
|
if (!atomic_add_unless(&s->s_active, -1, 1)) {
|
|
|
|
down_write(&s->s_umount);
|
|
|
|
deactivate_locked_super(s);
|
2009-05-06 07:07:50 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-22 20:22:31 +01:00
|
|
|
EXPORT_SYMBOL(deactivate_super);
|
2009-05-06 07:07:50 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/**
|
|
|
|
* grab_super - acquire an active reference
|
|
|
|
* @s: reference we are trying to make active
|
|
|
|
*
|
|
|
|
* Tries to acquire an active reference. grab_super() is used when we
|
|
|
|
* had just found a superblock in super_blocks or fs_type->fs_supers
|
|
|
|
* and want to turn it into a full-blown active reference. grab_super()
|
|
|
|
* is called with sb_lock held and drops it. Returns 1 in case of
|
|
|
|
* success, 0 if we had failed (superblock contents was already dead or
|
|
|
|
* dying when grab_super() had been called).
|
|
|
|
*/
|
2006-09-29 10:59:29 +02:00
|
|
|
static int grab_super(struct super_block *s) __releases(sb_lock)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2010-03-22 13:53:19 +01:00
|
|
|
if (atomic_inc_not_zero(&s->s_active)) {
|
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
down_write(&s->s_umount);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* it's going away */
|
2005-04-17 00:20:36 +02:00
|
|
|
s->s_count++;
|
|
|
|
spin_unlock(&sb_lock);
|
2010-03-22 20:22:31 +01:00
|
|
|
/* wait for it to die */
|
2005-04-17 00:20:36 +02:00
|
|
|
down_write(&s->s_umount);
|
|
|
|
up_write(&s->s_umount);
|
|
|
|
put_super(s);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-18 19:55:46 +02:00
|
|
|
/*
|
|
|
|
* Superblock locking. We really ought to get rid of these two.
|
|
|
|
*/
|
|
|
|
void lock_super(struct super_block * sb)
|
|
|
|
{
|
|
|
|
get_fs_excl();
|
|
|
|
mutex_lock(&sb->s_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
void unlock_super(struct super_block * sb)
|
|
|
|
{
|
|
|
|
put_fs_excl();
|
|
|
|
mutex_unlock(&sb->s_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(lock_super);
|
|
|
|
EXPORT_SYMBOL(unlock_super);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/**
|
|
|
|
* generic_shutdown_super - common helper for ->kill_sb()
|
|
|
|
* @sb: superblock to kill
|
|
|
|
*
|
|
|
|
* generic_shutdown_super() does all fs-independent work on superblock
|
|
|
|
* shutdown. Typical ->kill_sb() should pick all fs-specific objects
|
|
|
|
* that need destruction out of superblock, call generic_shutdown_super()
|
|
|
|
* and release aforementioned objects. Note: dentries and inodes _are_
|
|
|
|
* taken care of and do not need specific handling.
|
2006-10-11 10:22:19 +02:00
|
|
|
*
|
|
|
|
* Upon calling this function, the filesystem may no longer alter or
|
|
|
|
* rearrange the set of dentries belonging to this super_block, nor may it
|
|
|
|
* change the attachments of dentries to inodes.
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
|
|
|
void generic_shutdown_super(struct super_block *sb)
|
|
|
|
{
|
2007-02-12 09:55:41 +01:00
|
|
|
const struct super_operations *sop = sb->s_op;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-01-06 16:20:54 +01:00
|
|
|
|
2006-10-11 10:22:19 +02:00
|
|
|
if (sb->s_root) {
|
|
|
|
shrink_dcache_for_umount(sb);
|
2009-04-27 16:43:53 +02:00
|
|
|
sync_filesystem(sb);
|
2009-05-06 04:10:44 +02:00
|
|
|
get_fs_excl();
|
2005-04-17 00:20:36 +02:00
|
|
|
sb->s_flags &= ~MS_ACTIVE;
|
2009-01-06 16:20:54 +01:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* bad name - it should be evict_inodes() */
|
|
|
|
invalidate_inodes(sb);
|
|
|
|
|
|
|
|
if (sop->put_super)
|
|
|
|
sop->put_super(sb);
|
|
|
|
|
|
|
|
/* Forget any remaining inodes */
|
|
|
|
if (invalidate_inodes(sb)) {
|
2006-02-07 21:58:48 +01:00
|
|
|
printk("VFS: Busy inodes after unmount of %s. "
|
|
|
|
"Self-destruct in 5 seconds. Have a nice day...\n",
|
|
|
|
sb->s_id);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2009-05-06 04:10:44 +02:00
|
|
|
put_fs_excl();
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
spin_lock(&sb_lock);
|
|
|
|
/* should be initialized for __put_super_and_need_restart() */
|
2010-03-23 00:36:35 +01:00
|
|
|
list_del_init(&sb->s_instances);
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
up_write(&sb->s_umount);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(generic_shutdown_super);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* sget - find or create a superblock
|
|
|
|
* @type: filesystem type superblock should belong to
|
|
|
|
* @test: comparison callback
|
|
|
|
* @set: setup callback
|
|
|
|
* @data: argument to each of them
|
|
|
|
*/
|
|
|
|
struct super_block *sget(struct file_system_type *type,
|
|
|
|
int (*test)(struct super_block *,void *),
|
|
|
|
int (*set)(struct super_block *,void *),
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct super_block *s = NULL;
|
2007-10-19 08:39:57 +02:00
|
|
|
struct super_block *old;
|
2005-04-17 00:20:36 +02:00
|
|
|
int err;
|
|
|
|
|
|
|
|
retry:
|
|
|
|
spin_lock(&sb_lock);
|
2007-10-19 08:39:57 +02:00
|
|
|
if (test) {
|
|
|
|
list_for_each_entry(old, &type->fs_supers, s_instances) {
|
|
|
|
if (!test(old, data))
|
|
|
|
continue;
|
|
|
|
if (!grab_super(old))
|
|
|
|
goto retry;
|
2009-03-12 22:31:29 +01:00
|
|
|
if (s) {
|
|
|
|
up_write(&s->s_umount);
|
2007-10-19 08:39:57 +02:00
|
|
|
destroy_super(s);
|
2009-03-12 22:31:29 +01:00
|
|
|
}
|
2007-10-19 08:39:57 +02:00
|
|
|
return old;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
if (!s) {
|
|
|
|
spin_unlock(&sb_lock);
|
2006-07-03 09:25:27 +02:00
|
|
|
s = alloc_super(type);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!s)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = set(s, data);
|
|
|
|
if (err) {
|
|
|
|
spin_unlock(&sb_lock);
|
2009-03-12 22:31:29 +01:00
|
|
|
up_write(&s->s_umount);
|
2005-04-17 00:20:36 +02:00
|
|
|
destroy_super(s);
|
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
s->s_type = type;
|
|
|
|
strlcpy(s->s_id, type->name, sizeof(s->s_id));
|
|
|
|
list_add_tail(&s->s_list, &super_blocks);
|
|
|
|
list_add(&s->s_instances, &type->fs_supers);
|
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
get_filesystem(type);
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(sget);
|
|
|
|
|
|
|
|
void drop_super(struct super_block *sb)
|
|
|
|
{
|
|
|
|
up_read(&sb->s_umount);
|
|
|
|
put_super(sb);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(drop_super);
|
|
|
|
|
2009-05-05 16:08:56 +02:00
|
|
|
/**
|
|
|
|
* sync_supers - helper for periodic superblock writeback
|
|
|
|
*
|
|
|
|
* Call the write_super method if present on all dirty superblocks in
|
|
|
|
* the system. This is for the periodic writeback used by most older
|
|
|
|
* filesystems. For data integrity superblock writeback use
|
|
|
|
* sync_filesystems() instead.
|
|
|
|
*
|
2005-04-17 00:20:36 +02:00
|
|
|
* Note: check the dirty flag before waiting, so we don't
|
|
|
|
* hold up the sync while mounting a device. (The newly
|
|
|
|
* mounted device won't need syncing.)
|
|
|
|
*/
|
|
|
|
void sync_supers(void)
|
|
|
|
{
|
2010-03-23 01:09:33 +01:00
|
|
|
struct super_block *sb, *n;
|
2005-06-23 09:09:54 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_lock(&sb_lock);
|
2010-03-23 01:09:33 +01:00
|
|
|
list_for_each_entry_safe(sb, n, &super_blocks, s_list) {
|
2010-03-23 00:36:35 +01:00
|
|
|
if (list_empty(&sb->s_instances))
|
|
|
|
continue;
|
2009-05-05 16:08:56 +02:00
|
|
|
if (sb->s_op->write_super && sb->s_dirt) {
|
2005-04-17 00:20:36 +02:00
|
|
|
sb->s_count++;
|
|
|
|
spin_unlock(&sb_lock);
|
2009-05-05 16:08:56 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
down_read(&sb->s_umount);
|
2009-05-05 16:08:56 +02:00
|
|
|
if (sb->s_root && sb->s_dirt)
|
|
|
|
sb->s_op->write_super(sb);
|
2005-06-23 09:09:54 +02:00
|
|
|
up_read(&sb->s_umount);
|
2009-05-05 16:08:56 +02:00
|
|
|
|
2005-06-23 09:09:54 +02:00
|
|
|
spin_lock(&sb_lock);
|
2010-03-23 01:09:33 +01:00
|
|
|
__put_super(sb);
|
2005-06-23 09:09:54 +02:00
|
|
|
}
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* get_super - get the superblock of a device
|
|
|
|
* @bdev: device to get the superblock for
|
|
|
|
*
|
|
|
|
* Scans the superblock list and finds the superblock of the file system
|
|
|
|
* mounted on the device given. %NULL is returned if no match is found.
|
|
|
|
*/
|
|
|
|
|
|
|
|
struct super_block * get_super(struct block_device *bdev)
|
|
|
|
{
|
2005-06-23 09:09:54 +02:00
|
|
|
struct super_block *sb;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!bdev)
|
|
|
|
return NULL;
|
2005-06-23 09:09:54 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_lock(&sb_lock);
|
2005-06-23 09:09:54 +02:00
|
|
|
rescan:
|
|
|
|
list_for_each_entry(sb, &super_blocks, s_list) {
|
2010-03-23 00:36:35 +01:00
|
|
|
if (list_empty(&sb->s_instances))
|
|
|
|
continue;
|
2005-06-23 09:09:54 +02:00
|
|
|
if (sb->s_bdev == bdev) {
|
|
|
|
sb->s_count++;
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock(&sb_lock);
|
2005-06-23 09:09:54 +02:00
|
|
|
down_read(&sb->s_umount);
|
|
|
|
if (sb->s_root)
|
|
|
|
return sb;
|
|
|
|
up_read(&sb->s_umount);
|
|
|
|
/* restart only when sb is no longer on the list */
|
|
|
|
spin_lock(&sb_lock);
|
|
|
|
if (__put_super_and_need_restart(sb))
|
|
|
|
goto rescan;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(get_super);
|
2009-08-03 23:28:35 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* get_active_super - get an active reference to the superblock of a device
|
|
|
|
* @bdev: device to get the superblock for
|
|
|
|
*
|
|
|
|
* Scans the superblock list and finds the superblock of the file system
|
|
|
|
* mounted on the device given. Returns the superblock with an active
|
|
|
|
* reference and s_umount held exclusively or %NULL if none was found.
|
|
|
|
*/
|
|
|
|
struct super_block *get_active_super(struct block_device *bdev)
|
|
|
|
{
|
|
|
|
struct super_block *sb;
|
|
|
|
|
|
|
|
if (!bdev)
|
|
|
|
return NULL;
|
|
|
|
|
2010-03-23 01:15:33 +01:00
|
|
|
restart:
|
2009-08-03 23:28:35 +02:00
|
|
|
spin_lock(&sb_lock);
|
|
|
|
list_for_each_entry(sb, &super_blocks, s_list) {
|
2010-03-23 00:36:35 +01:00
|
|
|
if (list_empty(&sb->s_instances))
|
|
|
|
continue;
|
2010-03-23 01:15:33 +01:00
|
|
|
if (sb->s_bdev == bdev) {
|
|
|
|
if (grab_super(sb)) /* drops sb_lock */
|
|
|
|
return sb;
|
|
|
|
else
|
|
|
|
goto restart;
|
|
|
|
}
|
2009-08-03 23:28:35 +02:00
|
|
|
}
|
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
struct super_block * user_get_super(dev_t dev)
|
|
|
|
{
|
2005-06-23 09:09:54 +02:00
|
|
|
struct super_block *sb;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
spin_lock(&sb_lock);
|
2005-06-23 09:09:54 +02:00
|
|
|
rescan:
|
|
|
|
list_for_each_entry(sb, &super_blocks, s_list) {
|
2010-03-23 00:36:35 +01:00
|
|
|
if (list_empty(&sb->s_instances))
|
|
|
|
continue;
|
2005-06-23 09:09:54 +02:00
|
|
|
if (sb->s_dev == dev) {
|
|
|
|
sb->s_count++;
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock(&sb_lock);
|
2005-06-23 09:09:54 +02:00
|
|
|
down_read(&sb->s_umount);
|
|
|
|
if (sb->s_root)
|
|
|
|
return sb;
|
|
|
|
up_read(&sb->s_umount);
|
|
|
|
/* restart only when sb is no longer on the list */
|
|
|
|
spin_lock(&sb_lock);
|
|
|
|
if (__put_super_and_need_restart(sb))
|
|
|
|
goto rescan;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock(&sb_lock);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-01-14 14:14:13 +01:00
|
|
|
SYSCALL_DEFINE2(ustat, unsigned, dev, struct ustat __user *, ubuf)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct super_block *s;
|
|
|
|
struct ustat tmp;
|
|
|
|
struct kstatfs sbuf;
|
|
|
|
int err = -EINVAL;
|
|
|
|
|
|
|
|
s = user_get_super(new_decode_dev(dev));
|
|
|
|
if (s == NULL)
|
|
|
|
goto out;
|
2006-06-23 11:02:58 +02:00
|
|
|
err = vfs_statfs(s->s_root, &sbuf);
|
2005-04-17 00:20:36 +02:00
|
|
|
drop_super(s);
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
memset(&tmp,0,sizeof(struct ustat));
|
|
|
|
tmp.f_tfree = sbuf.f_bfree;
|
|
|
|
tmp.f_tinode = sbuf.f_ffree;
|
|
|
|
|
|
|
|
err = copy_to_user(ubuf,&tmp,sizeof(struct ustat)) ? -EFAULT : 0;
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* do_remount_sb - asks filesystem to change mount options.
|
|
|
|
* @sb: superblock in question
|
|
|
|
* @flags: numeric part of options
|
|
|
|
* @data: the rest of options
|
|
|
|
* @force: whether or not to force the change
|
|
|
|
*
|
|
|
|
* Alters the mount options of a mounted file system.
|
|
|
|
*/
|
|
|
|
int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
|
|
|
|
{
|
|
|
|
int retval;
|
2009-12-22 01:28:53 +01:00
|
|
|
int remount_rw, remount_ro;
|
2009-08-03 23:28:35 +02:00
|
|
|
|
|
|
|
if (sb->s_frozen != SB_UNFROZEN)
|
|
|
|
return -EBUSY;
|
|
|
|
|
[PATCH] BLOCK: Make it possible to disable the block layer [try #6]
Make it possible to disable the block layer. Not all embedded devices require
it, some can make do with just JFFS2, NFS, ramfs, etc - none of which require
the block layer to be present.
This patch does the following:
(*) Introduces CONFIG_BLOCK to disable the block layer, buffering and blockdev
support.
(*) Adds dependencies on CONFIG_BLOCK to any configuration item that controls
an item that uses the block layer. This includes:
(*) Block I/O tracing.
(*) Disk partition code.
(*) All filesystems that are block based, eg: Ext3, ReiserFS, ISOFS.
(*) The SCSI layer. As far as I can tell, even SCSI chardevs use the
block layer to do scheduling. Some drivers that use SCSI facilities -
such as USB storage - end up disabled indirectly from this.
(*) Various block-based device drivers, such as IDE and the old CDROM
drivers.
(*) MTD blockdev handling and FTL.
(*) JFFS - which uses set_bdev_super(), something it could avoid doing by
taking a leaf out of JFFS2's book.
(*) Makes most of the contents of linux/blkdev.h, linux/buffer_head.h and
linux/elevator.h contingent on CONFIG_BLOCK being set. sector_div() is,
however, still used in places, and so is still available.
(*) Also made contingent are the contents of linux/mpage.h, linux/genhd.h and
parts of linux/fs.h.
(*) Makes a number of files in fs/ contingent on CONFIG_BLOCK.
(*) Makes mm/bounce.c (bounce buffering) contingent on CONFIG_BLOCK.
(*) set_page_dirty() doesn't call __set_page_dirty_buffers() if CONFIG_BLOCK
is not enabled.
(*) fs/no-block.c is created to hold out-of-line stubs and things that are
required when CONFIG_BLOCK is not set:
(*) Default blockdev file operations (to give error ENODEV on opening).
(*) Makes some /proc changes:
(*) /proc/devices does not list any blockdevs.
(*) /proc/diskstats and /proc/partitions are contingent on CONFIG_BLOCK.
(*) Makes some compat ioctl handling contingent on CONFIG_BLOCK.
(*) If CONFIG_BLOCK is not defined, makes sys_quotactl() return -ENODEV if
given command other than Q_SYNC or if a special device is specified.
(*) In init/do_mounts.c, no reference is made to the blockdev routines if
CONFIG_BLOCK is not defined. This does not prohibit NFS roots or JFFS2.
(*) The bdflush, ioprio_set and ioprio_get syscalls can now be absent (return
error ENOSYS by way of cond_syscall if so).
(*) The seclvl_bd_claim() and seclvl_bd_release() security calls do nothing if
CONFIG_BLOCK is not set, since they can't then happen.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2006-09-30 20:45:40 +02:00
|
|
|
#ifdef CONFIG_BLOCK
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!(flags & MS_RDONLY) && bdev_read_only(sb->s_bdev))
|
|
|
|
return -EACCES;
|
[PATCH] BLOCK: Make it possible to disable the block layer [try #6]
Make it possible to disable the block layer. Not all embedded devices require
it, some can make do with just JFFS2, NFS, ramfs, etc - none of which require
the block layer to be present.
This patch does the following:
(*) Introduces CONFIG_BLOCK to disable the block layer, buffering and blockdev
support.
(*) Adds dependencies on CONFIG_BLOCK to any configuration item that controls
an item that uses the block layer. This includes:
(*) Block I/O tracing.
(*) Disk partition code.
(*) All filesystems that are block based, eg: Ext3, ReiserFS, ISOFS.
(*) The SCSI layer. As far as I can tell, even SCSI chardevs use the
block layer to do scheduling. Some drivers that use SCSI facilities -
such as USB storage - end up disabled indirectly from this.
(*) Various block-based device drivers, such as IDE and the old CDROM
drivers.
(*) MTD blockdev handling and FTL.
(*) JFFS - which uses set_bdev_super(), something it could avoid doing by
taking a leaf out of JFFS2's book.
(*) Makes most of the contents of linux/blkdev.h, linux/buffer_head.h and
linux/elevator.h contingent on CONFIG_BLOCK being set. sector_div() is,
however, still used in places, and so is still available.
(*) Also made contingent are the contents of linux/mpage.h, linux/genhd.h and
parts of linux/fs.h.
(*) Makes a number of files in fs/ contingent on CONFIG_BLOCK.
(*) Makes mm/bounce.c (bounce buffering) contingent on CONFIG_BLOCK.
(*) set_page_dirty() doesn't call __set_page_dirty_buffers() if CONFIG_BLOCK
is not enabled.
(*) fs/no-block.c is created to hold out-of-line stubs and things that are
required when CONFIG_BLOCK is not set:
(*) Default blockdev file operations (to give error ENODEV on opening).
(*) Makes some /proc changes:
(*) /proc/devices does not list any blockdevs.
(*) /proc/diskstats and /proc/partitions are contingent on CONFIG_BLOCK.
(*) Makes some compat ioctl handling contingent on CONFIG_BLOCK.
(*) If CONFIG_BLOCK is not defined, makes sys_quotactl() return -ENODEV if
given command other than Q_SYNC or if a special device is specified.
(*) In init/do_mounts.c, no reference is made to the blockdev routines if
CONFIG_BLOCK is not defined. This does not prohibit NFS roots or JFFS2.
(*) The bdflush, ioprio_set and ioprio_get syscalls can now be absent (return
error ENOSYS by way of cond_syscall if so).
(*) The seclvl_bd_claim() and seclvl_bd_release() security calls do nothing if
CONFIG_BLOCK is not set, since they can't then happen.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2006-09-30 20:45:40 +02:00
|
|
|
#endif
|
2009-08-03 23:28:35 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
if (flags & MS_RDONLY)
|
|
|
|
acct_auto_close(sb);
|
|
|
|
shrink_dcache_sb(sb);
|
2009-04-27 16:43:53 +02:00
|
|
|
sync_filesystem(sb);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-12-22 01:28:53 +01:00
|
|
|
remount_ro = (flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY);
|
|
|
|
remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
/* If we are remounting RDONLY and current sb is read/write,
|
|
|
|
make sure there are no rw files opened */
|
2009-12-22 01:28:53 +01:00
|
|
|
if (remount_ro) {
|
2005-04-17 00:20:36 +02:00
|
|
|
if (force)
|
|
|
|
mark_files_ro(sb);
|
2009-06-16 18:16:50 +02:00
|
|
|
else if (!fs_may_remount_ro(sb))
|
2005-04-17 00:20:36 +02:00
|
|
|
return -EBUSY;
|
2009-01-26 16:45:12 +01:00
|
|
|
retval = vfs_dq_off(sb, 1);
|
2009-06-16 18:16:50 +02:00
|
|
|
if (retval < 0 && retval != -ENOSYS)
|
2008-04-28 11:14:33 +02:00
|
|
|
return -EBUSY;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (sb->s_op->remount_fs) {
|
|
|
|
retval = sb->s_op->remount_fs(sb, &flags, data);
|
2009-06-16 18:16:50 +02:00
|
|
|
if (retval)
|
2005-04-17 00:20:36 +02:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
|
2008-04-28 11:14:33 +02:00
|
|
|
if (remount_rw)
|
2009-01-26 16:45:12 +01:00
|
|
|
vfs_dq_quota_on_remount(sb);
|
2009-12-22 01:28:53 +01:00
|
|
|
/*
|
|
|
|
* Some filesystems modify their metadata via some other path than the
|
|
|
|
* bdev buffer cache (eg. use a private mapping, or directories in
|
|
|
|
* pagecache, etc). Also file data modifications go via their own
|
|
|
|
* mappings. So If we try to mount readonly then copy the filesystem
|
|
|
|
* from bdev, we could get stale data, so invalidate it to give a best
|
|
|
|
* effort at coherency.
|
|
|
|
*/
|
|
|
|
if (remount_ro && sb->s_bdev)
|
|
|
|
invalidate_bdev(sb->s_bdev);
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-03-17 09:38:40 +01:00
|
|
|
static void do_emergency_remount(struct work_struct *work)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2010-03-23 01:11:53 +01:00
|
|
|
struct super_block *sb, *n;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
spin_lock(&sb_lock);
|
2010-03-23 01:11:53 +01:00
|
|
|
list_for_each_entry_safe(sb, n, &super_blocks, s_list) {
|
2010-03-23 00:36:35 +01:00
|
|
|
if (list_empty(&sb->s_instances))
|
|
|
|
continue;
|
2005-04-17 00:20:36 +02:00
|
|
|
sb->s_count++;
|
|
|
|
spin_unlock(&sb_lock);
|
2009-05-06 05:48:50 +02:00
|
|
|
down_write(&sb->s_umount);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (sb->s_root && sb->s_bdev && !(sb->s_flags & MS_RDONLY)) {
|
|
|
|
/*
|
|
|
|
* What lock protects sb->s_flags??
|
|
|
|
*/
|
|
|
|
do_remount_sb(sb, MS_RDONLY, NULL, 1);
|
|
|
|
}
|
2009-05-06 05:48:50 +02:00
|
|
|
up_write(&sb->s_umount);
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_lock(&sb_lock);
|
2010-03-23 01:11:53 +01:00
|
|
|
__put_super(sb);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
spin_unlock(&sb_lock);
|
2009-03-17 09:38:40 +01:00
|
|
|
kfree(work);
|
2005-04-17 00:20:36 +02:00
|
|
|
printk("Emergency Remount complete\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
void emergency_remount(void)
|
|
|
|
{
|
2009-03-17 09:38:40 +01:00
|
|
|
struct work_struct *work;
|
|
|
|
|
|
|
|
work = kmalloc(sizeof(*work), GFP_ATOMIC);
|
|
|
|
if (work) {
|
|
|
|
INIT_WORK(work, do_emergency_remount);
|
|
|
|
schedule_work(work);
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Unnamed block devices are dummy devices used by virtual
|
|
|
|
* filesystems which don't use real block-devices. -- jrs
|
|
|
|
*/
|
|
|
|
|
2008-08-28 04:26:23 +02:00
|
|
|
static DEFINE_IDA(unnamed_dev_ida);
|
2005-04-17 00:20:36 +02:00
|
|
|
static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
|
2009-06-24 08:05:18 +02:00
|
|
|
static int unnamed_dev_start = 0; /* don't bother trying below it */
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
int set_anon_super(struct super_block *s, void *data)
|
|
|
|
{
|
|
|
|
int dev;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
retry:
|
2008-08-28 04:26:23 +02:00
|
|
|
if (ida_pre_get(&unnamed_dev_ida, GFP_ATOMIC) == 0)
|
2005-04-17 00:20:36 +02:00
|
|
|
return -ENOMEM;
|
|
|
|
spin_lock(&unnamed_dev_lock);
|
2009-06-24 08:05:18 +02:00
|
|
|
error = ida_get_new_above(&unnamed_dev_ida, unnamed_dev_start, &dev);
|
2009-06-24 09:12:00 +02:00
|
|
|
if (!error)
|
|
|
|
unnamed_dev_start = dev + 1;
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock(&unnamed_dev_lock);
|
|
|
|
if (error == -EAGAIN)
|
|
|
|
/* We raced and lost with another CPU. */
|
|
|
|
goto retry;
|
|
|
|
else if (error)
|
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
|
|
|
|
spin_lock(&unnamed_dev_lock);
|
2008-08-28 04:26:23 +02:00
|
|
|
ida_remove(&unnamed_dev_ida, dev);
|
2009-06-24 09:12:00 +02:00
|
|
|
if (unnamed_dev_start > dev)
|
|
|
|
unnamed_dev_start = dev;
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock(&unnamed_dev_lock);
|
|
|
|
return -EMFILE;
|
|
|
|
}
|
|
|
|
s->s_dev = MKDEV(0, dev & MINORMASK);
|
2010-04-25 08:54:42 +02:00
|
|
|
s->s_bdi = &noop_backing_dev_info;
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(set_anon_super);
|
|
|
|
|
|
|
|
void kill_anon_super(struct super_block *sb)
|
|
|
|
{
|
|
|
|
int slot = MINOR(sb->s_dev);
|
|
|
|
|
|
|
|
generic_shutdown_super(sb);
|
|
|
|
spin_lock(&unnamed_dev_lock);
|
2008-08-28 04:26:23 +02:00
|
|
|
ida_remove(&unnamed_dev_ida, slot);
|
2009-06-24 08:05:18 +02:00
|
|
|
if (slot < unnamed_dev_start)
|
|
|
|
unnamed_dev_start = slot;
|
2005-04-17 00:20:36 +02:00
|
|
|
spin_unlock(&unnamed_dev_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(kill_anon_super);
|
|
|
|
|
|
|
|
void kill_litter_super(struct super_block *sb)
|
|
|
|
{
|
|
|
|
if (sb->s_root)
|
|
|
|
d_genocide(sb->s_root);
|
|
|
|
kill_anon_super(sb);
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(kill_litter_super);
|
|
|
|
|
2009-04-07 04:01:07 +02:00
|
|
|
static int ns_test_super(struct super_block *sb, void *data)
|
|
|
|
{
|
|
|
|
return sb->s_fs_info == data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ns_set_super(struct super_block *sb, void *data)
|
|
|
|
{
|
|
|
|
sb->s_fs_info = data;
|
|
|
|
return set_anon_super(sb, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
|
|
|
|
int (*fill_super)(struct super_block *, void *, int),
|
|
|
|
struct vfsmount *mnt)
|
|
|
|
{
|
|
|
|
struct super_block *sb;
|
|
|
|
|
|
|
|
sb = sget(fs_type, ns_test_super, ns_set_super, data);
|
|
|
|
if (IS_ERR(sb))
|
|
|
|
return PTR_ERR(sb);
|
|
|
|
|
|
|
|
if (!sb->s_root) {
|
|
|
|
int err;
|
|
|
|
sb->s_flags = flags;
|
|
|
|
err = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
|
|
|
|
if (err) {
|
2009-05-06 07:07:50 +02:00
|
|
|
deactivate_locked_super(sb);
|
2009-04-07 04:01:07 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
sb->s_flags |= MS_ACTIVE;
|
|
|
|
}
|
|
|
|
|
|
|
|
simple_set_mnt(mnt, sb);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(get_sb_ns);
|
|
|
|
|
[PATCH] BLOCK: Make it possible to disable the block layer [try #6]
Make it possible to disable the block layer. Not all embedded devices require
it, some can make do with just JFFS2, NFS, ramfs, etc - none of which require
the block layer to be present.
This patch does the following:
(*) Introduces CONFIG_BLOCK to disable the block layer, buffering and blockdev
support.
(*) Adds dependencies on CONFIG_BLOCK to any configuration item that controls
an item that uses the block layer. This includes:
(*) Block I/O tracing.
(*) Disk partition code.
(*) All filesystems that are block based, eg: Ext3, ReiserFS, ISOFS.
(*) The SCSI layer. As far as I can tell, even SCSI chardevs use the
block layer to do scheduling. Some drivers that use SCSI facilities -
such as USB storage - end up disabled indirectly from this.
(*) Various block-based device drivers, such as IDE and the old CDROM
drivers.
(*) MTD blockdev handling and FTL.
(*) JFFS - which uses set_bdev_super(), something it could avoid doing by
taking a leaf out of JFFS2's book.
(*) Makes most of the contents of linux/blkdev.h, linux/buffer_head.h and
linux/elevator.h contingent on CONFIG_BLOCK being set. sector_div() is,
however, still used in places, and so is still available.
(*) Also made contingent are the contents of linux/mpage.h, linux/genhd.h and
parts of linux/fs.h.
(*) Makes a number of files in fs/ contingent on CONFIG_BLOCK.
(*) Makes mm/bounce.c (bounce buffering) contingent on CONFIG_BLOCK.
(*) set_page_dirty() doesn't call __set_page_dirty_buffers() if CONFIG_BLOCK
is not enabled.
(*) fs/no-block.c is created to hold out-of-line stubs and things that are
required when CONFIG_BLOCK is not set:
(*) Default blockdev file operations (to give error ENODEV on opening).
(*) Makes some /proc changes:
(*) /proc/devices does not list any blockdevs.
(*) /proc/diskstats and /proc/partitions are contingent on CONFIG_BLOCK.
(*) Makes some compat ioctl handling contingent on CONFIG_BLOCK.
(*) If CONFIG_BLOCK is not defined, makes sys_quotactl() return -ENODEV if
given command other than Q_SYNC or if a special device is specified.
(*) In init/do_mounts.c, no reference is made to the blockdev routines if
CONFIG_BLOCK is not defined. This does not prohibit NFS roots or JFFS2.
(*) The bdflush, ioprio_set and ioprio_get syscalls can now be absent (return
error ENOSYS by way of cond_syscall if so).
(*) The seclvl_bd_claim() and seclvl_bd_release() security calls do nothing if
CONFIG_BLOCK is not set, since they can't then happen.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2006-09-30 20:45:40 +02:00
|
|
|
#ifdef CONFIG_BLOCK
|
2005-04-17 00:20:36 +02:00
|
|
|
static int set_bdev_super(struct super_block *s, void *data)
|
|
|
|
{
|
|
|
|
s->s_bdev = data;
|
|
|
|
s->s_dev = s->s_bdev->bd_dev;
|
2009-09-16 15:02:33 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We set the bdi here to the queue backing, file systems can
|
|
|
|
* overwrite this in ->fill_super()
|
|
|
|
*/
|
|
|
|
s->s_bdi = &bdev_get_queue(s->s_bdev)->backing_dev_info;
|
2005-04-17 00:20:36 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int test_bdev_super(struct super_block *s, void *data)
|
|
|
|
{
|
|
|
|
return (void *)s->s_bdev == data;
|
|
|
|
}
|
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
int get_sb_bdev(struct file_system_type *fs_type,
|
2005-04-17 00:20:36 +02:00
|
|
|
int flags, const char *dev_name, void *data,
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
int (*fill_super)(struct super_block *, void *, int),
|
|
|
|
struct vfsmount *mnt)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct block_device *bdev;
|
|
|
|
struct super_block *s;
|
2008-02-23 01:50:45 +01:00
|
|
|
fmode_t mode = FMODE_READ;
|
2005-04-17 00:20:36 +02:00
|
|
|
int error = 0;
|
|
|
|
|
2008-02-23 01:50:45 +01:00
|
|
|
if (!(flags & MS_RDONLY))
|
|
|
|
mode |= FMODE_WRITE;
|
|
|
|
|
|
|
|
bdev = open_bdev_exclusive(dev_name, mode, fs_type);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (IS_ERR(bdev))
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
return PTR_ERR(bdev);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* once the super is inserted into the list by sget, s_umount
|
|
|
|
* will protect the lockfs code from trying to start a snapshot
|
|
|
|
* while we are mounting
|
|
|
|
*/
|
2009-08-03 23:28:06 +02:00
|
|
|
mutex_lock(&bdev->bd_fsfreeze_mutex);
|
|
|
|
if (bdev->bd_fsfreeze_count > 0) {
|
|
|
|
mutex_unlock(&bdev->bd_fsfreeze_mutex);
|
|
|
|
error = -EBUSY;
|
|
|
|
goto error_bdev;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
s = sget(fs_type, test_bdev_super, set_bdev_super, bdev);
|
2009-08-03 23:28:06 +02:00
|
|
|
mutex_unlock(&bdev->bd_fsfreeze_mutex);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (IS_ERR(s))
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
goto error_s;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (s->s_root) {
|
|
|
|
if ((flags ^ s->s_flags) & MS_RDONLY) {
|
2009-05-06 07:07:50 +02:00
|
|
|
deactivate_locked_super(s);
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
error = -EBUSY;
|
|
|
|
goto error_bdev;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
|
2008-02-23 01:50:45 +01:00
|
|
|
close_bdev_exclusive(bdev, mode);
|
2005-04-17 00:20:36 +02:00
|
|
|
} else {
|
|
|
|
char b[BDEVNAME_SIZE];
|
|
|
|
|
|
|
|
s->s_flags = flags;
|
2008-02-23 01:50:45 +01:00
|
|
|
s->s_mode = mode;
|
2005-04-17 00:20:36 +02:00
|
|
|
strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
|
2006-01-08 10:03:39 +01:00
|
|
|
sb_set_blocksize(s, block_size(bdev));
|
[PATCH] vfs: MS_VERBOSE should be MS_SILENT
The meaning of MS_VERBOSE is backwards; if the bit is set, it really means,
"don't be verbose". This is confusing and counter-intuitive.
In addition, there is also no way to set the MS_VERBOSE flag in the
mount(8) program in util-linux, but interesting, it does define options
which would do the right thing if MS_SILENT were defined, which
unfortunately we do not:
#ifdef MS_SILENT
{ "quiet", 0, 0, MS_SILENT }, /* be quiet */
{ "loud", 0, 1, MS_SILENT }, /* print out messages. */
#endif
So the obvious fix is to deprecate the use of MS_VERBOSE and replace it
with MS_SILENT.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-24 12:15:10 +01:00
|
|
|
error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (error) {
|
2009-05-06 07:07:50 +02:00
|
|
|
deactivate_locked_super(s);
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
goto error;
|
2006-02-22 18:39:02 +01:00
|
|
|
}
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
|
|
|
|
s->s_flags |= MS_ACTIVE;
|
2009-01-03 15:47:09 +01:00
|
|
|
bdev->bd_super = s;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2009-03-04 21:06:34 +01:00
|
|
|
simple_set_mnt(mnt, s);
|
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
error_s:
|
|
|
|
error = PTR_ERR(s);
|
|
|
|
error_bdev:
|
2008-02-23 01:50:45 +01:00
|
|
|
close_bdev_exclusive(bdev, mode);
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
error:
|
|
|
|
return error;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(get_sb_bdev);
|
|
|
|
|
|
|
|
void kill_block_super(struct super_block *sb)
|
|
|
|
{
|
|
|
|
struct block_device *bdev = sb->s_bdev;
|
2008-02-23 01:50:45 +01:00
|
|
|
fmode_t mode = sb->s_mode;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-04-30 02:14:57 +02:00
|
|
|
bdev->bd_super = NULL;
|
2005-04-17 00:20:36 +02:00
|
|
|
generic_shutdown_super(sb);
|
|
|
|
sync_blockdev(bdev);
|
2008-02-23 01:50:45 +01:00
|
|
|
close_bdev_exclusive(bdev, mode);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(kill_block_super);
|
[PATCH] BLOCK: Make it possible to disable the block layer [try #6]
Make it possible to disable the block layer. Not all embedded devices require
it, some can make do with just JFFS2, NFS, ramfs, etc - none of which require
the block layer to be present.
This patch does the following:
(*) Introduces CONFIG_BLOCK to disable the block layer, buffering and blockdev
support.
(*) Adds dependencies on CONFIG_BLOCK to any configuration item that controls
an item that uses the block layer. This includes:
(*) Block I/O tracing.
(*) Disk partition code.
(*) All filesystems that are block based, eg: Ext3, ReiserFS, ISOFS.
(*) The SCSI layer. As far as I can tell, even SCSI chardevs use the
block layer to do scheduling. Some drivers that use SCSI facilities -
such as USB storage - end up disabled indirectly from this.
(*) Various block-based device drivers, such as IDE and the old CDROM
drivers.
(*) MTD blockdev handling and FTL.
(*) JFFS - which uses set_bdev_super(), something it could avoid doing by
taking a leaf out of JFFS2's book.
(*) Makes most of the contents of linux/blkdev.h, linux/buffer_head.h and
linux/elevator.h contingent on CONFIG_BLOCK being set. sector_div() is,
however, still used in places, and so is still available.
(*) Also made contingent are the contents of linux/mpage.h, linux/genhd.h and
parts of linux/fs.h.
(*) Makes a number of files in fs/ contingent on CONFIG_BLOCK.
(*) Makes mm/bounce.c (bounce buffering) contingent on CONFIG_BLOCK.
(*) set_page_dirty() doesn't call __set_page_dirty_buffers() if CONFIG_BLOCK
is not enabled.
(*) fs/no-block.c is created to hold out-of-line stubs and things that are
required when CONFIG_BLOCK is not set:
(*) Default blockdev file operations (to give error ENODEV on opening).
(*) Makes some /proc changes:
(*) /proc/devices does not list any blockdevs.
(*) /proc/diskstats and /proc/partitions are contingent on CONFIG_BLOCK.
(*) Makes some compat ioctl handling contingent on CONFIG_BLOCK.
(*) If CONFIG_BLOCK is not defined, makes sys_quotactl() return -ENODEV if
given command other than Q_SYNC or if a special device is specified.
(*) In init/do_mounts.c, no reference is made to the blockdev routines if
CONFIG_BLOCK is not defined. This does not prohibit NFS roots or JFFS2.
(*) The bdflush, ioprio_set and ioprio_get syscalls can now be absent (return
error ENOSYS by way of cond_syscall if so).
(*) The seclvl_bd_claim() and seclvl_bd_release() security calls do nothing if
CONFIG_BLOCK is not set, since they can't then happen.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2006-09-30 20:45:40 +02:00
|
|
|
#endif
|
2005-04-17 00:20:36 +02:00
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
int get_sb_nodev(struct file_system_type *fs_type,
|
2005-04-17 00:20:36 +02:00
|
|
|
int flags, void *data,
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
int (*fill_super)(struct super_block *, void *, int),
|
|
|
|
struct vfsmount *mnt)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
int error;
|
|
|
|
struct super_block *s = sget(fs_type, NULL, set_anon_super, NULL);
|
|
|
|
|
|
|
|
if (IS_ERR(s))
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
return PTR_ERR(s);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
s->s_flags = flags;
|
|
|
|
|
[PATCH] vfs: MS_VERBOSE should be MS_SILENT
The meaning of MS_VERBOSE is backwards; if the bit is set, it really means,
"don't be verbose". This is confusing and counter-intuitive.
In addition, there is also no way to set the MS_VERBOSE flag in the
mount(8) program in util-linux, but interesting, it does define options
which would do the right thing if MS_SILENT were defined, which
unfortunately we do not:
#ifdef MS_SILENT
{ "quiet", 0, 0, MS_SILENT }, /* be quiet */
{ "loud", 0, 1, MS_SILENT }, /* print out messages. */
#endif
So the obvious fix is to deprecate the use of MS_VERBOSE and replace it
with MS_SILENT.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-24 12:15:10 +01:00
|
|
|
error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (error) {
|
2009-05-06 07:07:50 +02:00
|
|
|
deactivate_locked_super(s);
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
return error;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
s->s_flags |= MS_ACTIVE;
|
2009-03-04 21:06:34 +01:00
|
|
|
simple_set_mnt(mnt, s);
|
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(get_sb_nodev);
|
|
|
|
|
|
|
|
static int compare_single(struct super_block *s, void *p)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
int get_sb_single(struct file_system_type *fs_type,
|
2005-04-17 00:20:36 +02:00
|
|
|
int flags, void *data,
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
int (*fill_super)(struct super_block *, void *, int),
|
|
|
|
struct vfsmount *mnt)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct super_block *s;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
s = sget(fs_type, compare_single, set_anon_super, NULL);
|
|
|
|
if (IS_ERR(s))
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
return PTR_ERR(s);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (!s->s_root) {
|
|
|
|
s->s_flags = flags;
|
[PATCH] vfs: MS_VERBOSE should be MS_SILENT
The meaning of MS_VERBOSE is backwards; if the bit is set, it really means,
"don't be verbose". This is confusing and counter-intuitive.
In addition, there is also no way to set the MS_VERBOSE flag in the
mount(8) program in util-linux, but interesting, it does define options
which would do the right thing if MS_SILENT were defined, which
unfortunately we do not:
#ifdef MS_SILENT
{ "quiet", 0, 0, MS_SILENT }, /* be quiet */
{ "loud", 0, 1, MS_SILENT }, /* print out messages. */
#endif
So the obvious fix is to deprecate the use of MS_VERBOSE and replace it
with MS_SILENT.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-24 12:15:10 +01:00
|
|
|
error = fill_super(s, data, flags & MS_SILENT ? 1 : 0);
|
2005-04-17 00:20:36 +02:00
|
|
|
if (error) {
|
2009-05-06 07:07:50 +02:00
|
|
|
deactivate_locked_super(s);
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
return error;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
s->s_flags |= MS_ACTIVE;
|
2009-12-18 21:18:15 +01:00
|
|
|
} else {
|
|
|
|
do_remount_sb(s, flags, data, 0);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
2009-03-04 21:06:34 +01:00
|
|
|
simple_set_mnt(mnt, s);
|
|
|
|
return 0;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(get_sb_single);
|
|
|
|
|
|
|
|
struct vfsmount *
|
2006-06-09 15:34:15 +02:00
|
|
|
vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void *data)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
struct vfsmount *mnt;
|
|
|
|
char *secdata = NULL;
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
int error;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
if (!type)
|
|
|
|
return ERR_PTR(-ENODEV);
|
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
error = -ENOMEM;
|
2005-04-17 00:20:36 +02:00
|
|
|
mnt = alloc_vfsmnt(name);
|
|
|
|
if (!mnt)
|
|
|
|
goto out;
|
|
|
|
|
2010-02-05 15:30:46 +01:00
|
|
|
if (flags & MS_KERNMOUNT)
|
|
|
|
mnt->mnt_flags = MNT_INTERNAL;
|
|
|
|
|
2008-03-05 16:31:54 +01:00
|
|
|
if (data && !(type->fs_flags & FS_BINARY_MOUNTDATA)) {
|
2005-04-17 00:20:36 +02:00
|
|
|
secdata = alloc_secdata();
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
if (!secdata)
|
2005-04-17 00:20:36 +02:00
|
|
|
goto out_mnt;
|
|
|
|
|
2008-03-05 16:31:54 +01:00
|
|
|
error = security_sb_copy_data(data, secdata);
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
if (error)
|
2005-04-17 00:20:36 +02:00
|
|
|
goto out_free_secdata;
|
|
|
|
}
|
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
error = type->get_sb(type, flags, name, data, mnt);
|
|
|
|
if (error < 0)
|
2005-04-17 00:20:36 +02:00
|
|
|
goto out_free_secdata;
|
2007-07-16 08:40:54 +02:00
|
|
|
BUG_ON(!mnt->mnt_sb);
|
2010-04-25 08:54:42 +02:00
|
|
|
WARN_ON(!mnt->mnt_sb->s_bdi);
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
|
2010-04-25 08:54:42 +02:00
|
|
|
error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata);
|
|
|
|
if (error)
|
|
|
|
goto out_sb;
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
|
2009-09-18 22:05:53 +02:00
|
|
|
/*
|
|
|
|
* filesystems should never set s_maxbytes larger than MAX_LFS_FILESIZE
|
|
|
|
* but s_maxbytes was an unsigned long long for many releases. Throw
|
|
|
|
* this warning for a little while to try and catch filesystems that
|
|
|
|
* violate this rule. This warning should be either removed or
|
|
|
|
* converted to a BUG() in 2.6.34.
|
|
|
|
*/
|
|
|
|
WARN((mnt->mnt_sb->s_maxbytes < 0), "%s set sb->s_maxbytes to "
|
|
|
|
"negative value (%lld)\n", type->name, mnt->mnt_sb->s_maxbytes);
|
|
|
|
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
mnt->mnt_mountpoint = mnt->mnt_root;
|
2005-04-17 00:20:36 +02:00
|
|
|
mnt->mnt_parent = mnt;
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
up_write(&mnt->mnt_sb->s_umount);
|
2005-06-22 02:15:16 +02:00
|
|
|
free_secdata(secdata);
|
2005-04-17 00:20:36 +02:00
|
|
|
return mnt;
|
|
|
|
out_sb:
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
dput(mnt->mnt_root);
|
2009-05-06 07:07:50 +02:00
|
|
|
deactivate_locked_super(mnt->mnt_sb);
|
2005-04-17 00:20:36 +02:00
|
|
|
out_free_secdata:
|
|
|
|
free_secdata(secdata);
|
|
|
|
out_mnt:
|
|
|
|
free_vfsmnt(mnt);
|
|
|
|
out:
|
[PATCH] VFS: Permit filesystem to override root dentry on mount
Extend the get_sb() filesystem operation to take an extra argument that
permits the VFS to pass in the target vfsmount that defines the mountpoint.
The filesystem is then required to manually set the superblock and root dentry
pointers. For most filesystems, this should be done with simple_set_mnt()
which will set the superblock pointer and then set the root dentry to the
superblock's s_root (as per the old default behaviour).
The get_sb() op now returns an integer as there's now no need to return the
superblock pointer.
This patch permits a superblock to be implicitly shared amongst several mount
points, such as can be done with NFS to avoid potential inode aliasing. In
such a case, simple_set_mnt() would not be called, and instead the mnt_root
and mnt_sb would be set directly.
The patch also makes the following changes:
(*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
pointer argument and return an integer, so most filesystems have to change
very little.
(*) If one of the convenience function is not used, then get_sb() should
normally call simple_set_mnt() to instantiate the vfsmount. This will
always return 0, and so can be tail-called from get_sb().
(*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
dcache upon superblock destruction rather than shrink_dcache_anon().
This is required because the superblock may now have multiple trees that
aren't actually bound to s_root, but that still need to be cleaned up. The
currently called functions assume that the whole tree is rooted at s_root,
and that anonymous dentries are not the roots of trees which results in
dentries being left unculled.
However, with the way NFS superblock sharing are currently set to be
implemented, these assumptions are violated: the root of the filesystem is
simply a dummy dentry and inode (the real inode for '/' may well be
inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
with child trees.
[*] Anonymous until discovered from another tree.
(*) The documentation has been adjusted, including the additional bit of
changing ext2_* into foo_* in the documentation.
[akpm@osdl.org: convert ipath_fs, do other stuff]
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 11:02:57 +02:00
|
|
|
return ERR_PTR(error);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2006-06-09 15:34:15 +02:00
|
|
|
EXPORT_SYMBOL_GPL(vfs_kern_mount);
|
|
|
|
|
add filesystem subtype support
There's a slight problem with filesystem type representation in fuse
based filesystems.
From the kernel's view, there are just two filesystem types: fuse and
fuseblk. From the user's view there are lots of different filesystem
types. The user is not even much concerned if the filesystem is fuse based
or not. So there's a conflict of interest in how this should be
represented in fstab, mtab and /proc/mounts.
The current scheme is to encode the real filesystem type in the mount
source. So an sshfs mount looks like this:
sshfs#user@server:/ /mnt/server fuse rw,nosuid,nodev,...
This url-ish syntax works OK for sshfs and similar filesystems. However
for block device based filesystems (ntfs-3g, zfs) it doesn't work, since
the kernel expects the mount source to be a real device name.
A possibly better scheme would be to encode the real type in the type
field as "type.subtype". So fuse mounts would look like this:
/dev/hda1 /mnt/windows fuseblk.ntfs-3g rw,...
user@server:/ /mnt/server fuse.sshfs rw,nosuid,nodev,...
This patch adds the necessary code to the kernel so that this can be
correctly displayed in /proc/mounts.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 09:25:43 +02:00
|
|
|
static struct vfsmount *fs_set_subtype(struct vfsmount *mnt, const char *fstype)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
const char *subtype = strchr(fstype, '.');
|
|
|
|
if (subtype) {
|
|
|
|
subtype++;
|
|
|
|
err = -EINVAL;
|
|
|
|
if (!subtype[0])
|
|
|
|
goto err;
|
|
|
|
} else
|
|
|
|
subtype = "";
|
|
|
|
|
|
|
|
mnt->mnt_sb->s_subtype = kstrdup(subtype, GFP_KERNEL);
|
|
|
|
err = -ENOMEM;
|
|
|
|
if (!mnt->mnt_sb->s_subtype)
|
|
|
|
goto err;
|
|
|
|
return mnt;
|
|
|
|
|
|
|
|
err:
|
|
|
|
mntput(mnt);
|
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
|
2006-06-09 15:34:15 +02:00
|
|
|
struct vfsmount *
|
|
|
|
do_kern_mount(const char *fstype, int flags, const char *name, void *data)
|
|
|
|
{
|
|
|
|
struct file_system_type *type = get_fs_type(fstype);
|
|
|
|
struct vfsmount *mnt;
|
|
|
|
if (!type)
|
|
|
|
return ERR_PTR(-ENODEV);
|
|
|
|
mnt = vfs_kern_mount(type, flags, name, data);
|
add filesystem subtype support
There's a slight problem with filesystem type representation in fuse
based filesystems.
From the kernel's view, there are just two filesystem types: fuse and
fuseblk. From the user's view there are lots of different filesystem
types. The user is not even much concerned if the filesystem is fuse based
or not. So there's a conflict of interest in how this should be
represented in fstab, mtab and /proc/mounts.
The current scheme is to encode the real filesystem type in the mount
source. So an sshfs mount looks like this:
sshfs#user@server:/ /mnt/server fuse rw,nosuid,nodev,...
This url-ish syntax works OK for sshfs and similar filesystems. However
for block device based filesystems (ntfs-3g, zfs) it doesn't work, since
the kernel expects the mount source to be a real device name.
A possibly better scheme would be to encode the real type in the type
field as "type.subtype". So fuse mounts would look like this:
/dev/hda1 /mnt/windows fuseblk.ntfs-3g rw,...
user@server:/ /mnt/server fuse.sshfs rw,nosuid,nodev,...
This patch adds the necessary code to the kernel so that this can be
correctly displayed in /proc/mounts.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 09:25:43 +02:00
|
|
|
if (!IS_ERR(mnt) && (type->fs_flags & FS_HAS_SUBTYPE) &&
|
|
|
|
!mnt->mnt_sb->s_subtype)
|
|
|
|
mnt = fs_set_subtype(mnt, fstype);
|
2006-06-09 15:34:15 +02:00
|
|
|
put_filesystem(type);
|
|
|
|
return mnt;
|
|
|
|
}
|
2008-02-24 07:43:03 +01:00
|
|
|
EXPORT_SYMBOL_GPL(do_kern_mount);
|
2006-06-09 15:34:15 +02:00
|
|
|
|
2007-10-19 08:40:02 +02:00
|
|
|
struct vfsmount *kern_mount_data(struct file_system_type *type, void *data)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2007-10-19 08:40:02 +02:00
|
|
|
return vfs_kern_mount(type, MS_KERNMOUNT, type->name, data);
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2007-10-19 08:40:02 +02:00
|
|
|
EXPORT_SYMBOL_GPL(kern_mount_data);
|