[PATCH] (3/4) ->kill_sb() switchover

The rest of nodev filesystems switched.

diff --git a/drivers/isdn/avmb1/capifs.c b/drivers/isdn/avmb1/capifs.c
index 1e7b287945bfb0745646902ccd5fa953b9d5f76e..b2d4aedff998c3e07ab61f4850df54354aba478c 100644 (file)
--- a/drivers/isdn/avmb1/capifs.c
+++ b/drivers/isdn/avmb1/capifs.c
@@ -387,6 +387,7 @@ static struct file_system_type capifs_fs_type = {
        owner:          THIS_MODULE,
        name:           "capifs",
        get_sb:         capifs_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 void capifs_new_ncci(char type, unsigned int num, kdev_t device)

diff --git a/drivers/usb/inode.c b/drivers/usb/inode.c
index d3d6582957d29292f87847f4fdc12f801d0a1ce7..38fdc944219fe50930d291c693d57da285ec20a0 100644 (file)
--- a/drivers/usb/inode.c
+++ b/drivers/usb/inode.c
@@ -489,12 +489,14 @@ static struct file_system_type usbdevice_fs_type = {
        owner:          THIS_MODULE,
        name:           "usbdevfs",
        get_sb:         usb_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 static struct file_system_type usb_fs_type = {
        owner:          THIS_MODULE,
        name:           "usbfs",
        get_sb:         usb_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 /* --------------------------------------------------------------------- */

diff --git a/fs/autofs/init.c b/fs/autofs/init.c
index b73fec09f7c260ac2357c93973218140c82caf48..2bfb80eab87bd93edf1a8da45215c6b0486cca25 100644 (file)
--- a/fs/autofs/init.c
+++ b/fs/autofs/init.c
@@ -24,6 +24,7 @@ static struct file_system_type autofs_fs_type = {
        owner:          THIS_MODULE,
        name:           "autofs",
        get_sb:         autofs_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 static int __init init_autofs_fs(void)

diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c
index fdce6b04367c4adbcc7b1ad91bc13cca3700ea3d..1576d28addd702b7102f7cd1ba140c36660ade50 100644 (file)
--- a/fs/autofs4/init.c
+++ b/fs/autofs4/init.c
@@ -24,6 +24,7 @@ static struct file_system_type autofs_fs_type = {
        owner:          THIS_MODULE,
        name:           "autofs",
        get_sb:         autofs_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 static int __init init_autofs4_fs(void)

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 1d1bd867f862d9066273967e73d29cb968024b2a..30ec91b830d44e498a211a1f0a9873810b6a1e8b 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -260,6 +260,7 @@ static struct super_block *bd_get_sb(struct file_system_type *fs_type,
 static struct file_system_type bd_type = {
        name:           "bdev",
        get_sb:         bd_get_sb,
+       kill_sb:        kill_anon_super,
        fs_flags:       FS_NOMOUNT,
 };
 

diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 323920b06e69afe890c3efb93324afc3695eab1e..c2c083b8e25573ee579c871ba231eaefb65eaf51 100644 (file)
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -316,4 +316,5 @@ struct file_system_type coda_fs_type = {
        owner:          THIS_MODULE,
        name:           "coda",
        get_sb:         coda_get_sb,
+       kill_sb:        kill_anon_super,
 };

diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 3fac42a6957c4ab4502a837499f74cfa4cfc4ef2..d0d4763fdea232efcfd75e8386ecf3ada0ba151b 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -3323,6 +3323,7 @@ static struct super_block *devfs_get_sb(struct file_system_type *fs_type,
 static struct file_system_type devfs_fs_type = {
        name:           DEVFS_NAME,
        get_sb:         devfs_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 /*  File operations for devfsd follow  */

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 1816bd4137c748514332ee8dae142782d5dcfe78..4e69e33efc13dfbc0f7d5534cbe6df20a20443ce 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -189,6 +189,7 @@ static struct file_system_type devpts_fs_type = {
        owner:          THIS_MODULE,
        name:           "devpts",
        get_sb:         devpts_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 void devpts_pty_new(int number, kdev_t device)

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index efe7c89286c66e2a567321023d327b43a6bc2b41..8bdc5770fd91295005d2af79f50c2daa0f376b98 100644 (file)
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -744,6 +744,7 @@ static struct file_system_type ncp_fs_type = {
        owner:          THIS_MODULE,
        name:           "ncpfs",
        get_sb:         ncp_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 static int __init init_ncp_fs(void)

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index e2821e8a9cbd7875f1984557af866453f589a2cb..3aa6f9734f998ff0d0e4da5b9e268df0cab49fd6 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1155,6 +1155,7 @@ static struct file_system_type nfs_fs_type = {
        owner:          THIS_MODULE,
        name:           "nfs",
        get_sb:         nfs_get_sb,
+       kill_sb:        kill_anon_super,
        fs_flags:       FS_ODD_RENAME,
 };
 

diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index b9272c96180f316738c8b474a5357eb583a95eef..f72d60006424dba29b7ab54a12395c04a57f9011 100644 (file)
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -1043,6 +1043,7 @@ static struct file_system_type openprom_fs_type = {
        owner:          THIS_MODULE,
        name:           "openpromfs",
        get_sb:         openprom_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 static int __init init_openprom_fs(void)

diff --git a/fs/pipe.c b/fs/pipe.c
index f2d9da0143c70b66b00b59ec145941745ca2d2bf..3fe3b3f9fe515e77a2b52fd90466dfe6b3e9934a 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -635,6 +635,7 @@ static struct super_block *pipefs_get_sb(struct file_system_type *fs_type,
 static struct file_system_type pipe_fs_type = {
        name:           "pipefs",
        get_sb:         pipefs_get_sb,
+       kill_sb:        kill_anon_super,
        fs_flags:       FS_NOMOUNT,
 };
 

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 49da1742c4709dfa0b51542c1831d72b20038c96..f905a8522f5b1ef409ee337fb105f07161193f71 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -33,6 +33,7 @@ static struct super_block *proc_get_sb(struct file_system_type *fs_type,
 static struct file_system_type proc_fs_type = {
        name:           "proc",
        get_sb:         proc_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 extern int __init proc_init_inodecache(void);

diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index da2f51439ce1f08a1c178222b6096f1597db111e..2f57be53425ac448c241b142b07c29434ca304d9 100644 (file)
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -719,6 +719,7 @@ static struct file_system_type smb_fs_type = {
        owner:          THIS_MODULE,
        name:           "smbfs",
        get_sb:         smb_get_sb,
+       kill_sb:        kill_anon_super,
 };
 
 static int __init init_smb_fs(void)

diff --git a/fs/super.c b/fs/super.c
index bc2ed690674d1636d8e336d8f554998dd96e3a1f..97637f020512d796ff6a217d00ddfc86827dc9b6 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -376,8 +376,6 @@ static void insert_super(struct super_block *s, struct file_system_type *type)
        get_filesystem(type);
 }
 
-static void put_anon_dev(kdev_t dev);
-
 /**
  *     remove_super    -       makes superblock unreachable
  *     @s:     superblock in question
@@ -437,15 +435,11 @@ static void generic_shutdown_super(struct super_block *sb)
 static void shutdown_super(struct super_block *sb)
 {
        struct file_system_type *fs = sb->s_type;
-       kdev_t dev = sb->s_dev;
        struct block_device *bdev = sb->s_bdev;
 
        generic_shutdown_super(sb);
-       if (bdev) {
-               bd_release(bdev);
-               blkdev_put(bdev, BDEV_FS);
-       } else
-               put_anon_dev(dev);
+       bd_release(bdev);
+       blkdev_put(bdev, BDEV_FS);
 }
 
 void kill_super(struct super_block *sb)
@@ -615,17 +609,6 @@ enum {Max_anon = 256};
 static unsigned long unnamed_dev_in_use[Max_anon/(8*sizeof(unsigned long))];
 static spinlock_t unnamed_dev_lock = SPIN_LOCK_UNLOCKED;/* protects the above */
 
-/**
- *     put_anon_dev    -       release anonymous device number.
- *     @dev:   device in question
- */
-static void put_anon_dev(kdev_t dev)
-{
-       spin_lock(&unnamed_dev_lock);
-       clear_bit(minor(dev), unnamed_dev_in_use);
-       spin_unlock(&unnamed_dev_lock);
-}
-
 /**
  *     get_anon_super  -       allocate a superblock for non-device fs
  *     @type:          filesystem type

diff --git a/net/socket.c b/net/socket.c
index 167c260d4a5a090d5ed9941cc8a00c0b6ce46d55..1b6351a167f82f53ce9e18d741f036e5374c7183 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -359,6 +359,7 @@ static struct vfsmount *sock_mnt;
 static struct file_system_type sock_fs_type = {
        name:           "sockfs",
        get_sb:         sockfs_get_sb,
+       kill_sb:        kill_anon_super,
        fs_flags:       FS_NOMOUNT,
 };
 static int sockfs_delete_dentry(struct dentry *dentry)