diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
| commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
| tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /fs/umsdos | |
| parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) | |
Merge with Linux 2.3.51.
Diffstat (limited to 'fs/umsdos')
| -rw-r--r-- | fs/umsdos/inode.c | 12 | ||||
| -rw-r--r-- | fs/umsdos/namei.c | 2 | ||||
| -rw-r--r-- | fs/umsdos/rdir.c | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/fs/umsdos/inode.c b/fs/umsdos/inode.c index 7908144d7..61c832ed4 100644 --- a/fs/umsdos/inode.c +++ b/fs/umsdos/inode.c @@ -75,7 +75,6 @@ saved_root->d_count); pseudo_root = NULL; } msdos_put_super (sb); - MOD_DEC_USE_COUNT; } @@ -334,7 +333,6 @@ struct super_block *UMSDOS_read_super (struct super_block *sb, void *data, struct super_block *res; struct dentry *new_root; - MOD_INC_USE_COUNT; MSDOS_SB(sb)->options.isvfat = 0; /* * Call msdos-fs to mount the disk. @@ -381,8 +379,6 @@ struct super_block *UMSDOS_read_super (struct super_block *sb, void *data, out_fail: printk(KERN_INFO "UMSDOS: msdos_read_super failed, mount aborted.\n"); - sb->s_dev = 0; - MOD_DEC_USE_COUNT; return NULL; } @@ -437,13 +433,7 @@ out_noroot: } -static struct file_system_type umsdos_fs_type = -{ - "umsdos", - FS_REQUIRES_DEV, - UMSDOS_read_super, - NULL -}; +static DECLARE_FSTYPE_DEV(umsdos_fs_type, "umsdos", UMSDOS_read_super); int __init init_umsdos_fs (void) { diff --git a/fs/umsdos/namei.c b/fs/umsdos/namei.c index 08bb7b340..75715116f 100644 --- a/fs/umsdos/namei.c +++ b/fs/umsdos/namei.c @@ -876,7 +876,7 @@ int UMSDOS_rmdir (struct inode *dir, struct dentry *dentry) goto out; ret = -EBUSY; - if (!list_empty(&dentry->d_hash)) + if (!d_unhashed(dentry)) goto out; /* check whether the EMD is empty */ diff --git a/fs/umsdos/rdir.c b/fs/umsdos/rdir.c index d05dfed73..8c71dd727 100644 --- a/fs/umsdos/rdir.c +++ b/fs/umsdos/rdir.c @@ -157,7 +157,7 @@ static int UMSDOS_rrmdir ( struct inode *dir, struct dentry *dentry) goto out; ret = -EBUSY; - if (!list_empty(&dentry->d_hash)) + if (!d_unhashed(dentry)) goto out; ret = msdos_rmdir (dir, dentry); |