patch-2.3.1 linux/fs/hfs/dir_dbl.c

• Lines: 57
• Date: Thu May 13 10:53:59 1999
• Orig file: v2.3.0/linux/fs/hfs/dir_dbl.c
• Orig date: Fri Apr 23 21:20:37 1999

diff -u --recursive --new-file v2.3.0/linux/fs/hfs/dir_dbl.c linux/fs/hfs/dir_dbl.c
@@ -27,7 +27,6 @@
 static int dbl_readdir(struct file *, void *, filldir_t);
 static int dbl_create(struct inode *, struct dentry *, int);
 static int dbl_mkdir(struct inode *, struct dentry *, int);
-static int dbl_mknod(struct inode *, struct dentry *, int, int);
 static int dbl_unlink(struct inode *, struct dentry *);
 static int dbl_rmdir(struct inode *, struct dentry *);
 static int dbl_rename(struct inode *, struct dentry *,
@@ -83,7 +82,7 @@
 	NULL,			/* symlink */
 	dbl_mkdir,		/* mkdir */
 	dbl_rmdir,		/* rmdir */
-	dbl_mknod,		/* mknod */
+	NULL,			/* mknod */
 	dbl_rename,		/* rename */
 	NULL,			/* readlink */
 	NULL,			/* follow_link */
@@ -202,10 +201,6 @@
         struct hfs_cat_entry *entry;
 	struct inode *dir = filp->f_dentry->d_inode;
 
-	if (!dir || !dir->i_sb || !S_ISDIR(dir->i_mode)) {
-		return -EBADF;
-	}
-
 	entry = HFS_I(dir)->entry;
 
 	if (filp->f_pos == 0) {
@@ -318,28 +313,6 @@
 		error = -EEXIST;
 	} else {
 		error = hfs_mkdir(parent, dentry, mode);
-	}
-	return error;
-}
-
-/*
- * dbl_mknod()
- *
- * This is the mknod() entry in the inode_operations structure for
- * regular HFS directories.  The purpose is to create a new entry
- * in a directory, given the inode for the parent directory and the
- * name (and its length) and the mode of the new entry (and the device
- * number if the entry is to be a device special file).
- */
-static int dbl_mknod(struct inode *dir, struct dentry *dentry,
-		     int mode, int rdev)
-{
-	int error;
-
-	if (is_hdr(dir, dentry->d_name.name, dentry->d_name.len)) {
-		error = -EEXIST;
-	} else {
-		error = hfs_mknod(dir, dentry, mode, rdev);
 	}
 	return error;
 }