summaryrefslogtreecommitdiffstats
path: root/fs/udf/dir.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-02 02:36:47 +0000
commit8624512aa908741ba2795200133eae0d7f4557ea (patch)
treed5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/udf/dir.c
parent7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff)
Merge with 2.3.48.
Diffstat (limited to 'fs/udf/dir.c')
-rw-r--r--fs/udf/dir.c30
1 files changed, 2 insertions, 28 deletions
diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 963d20344..c31ff527a 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -49,39 +49,13 @@ static int do_udf_readdir(struct inode *, struct file *, filldir_t, void *);
/* readdir and lookup functions */
-static struct file_operations udf_dir_operations = {
+struct file_operations udf_dir_operations = {
+ read: generic_read_dir,
readdir: udf_readdir,
ioctl: udf_ioctl,
fsync: udf_sync_file,
};
-struct inode_operations udf_dir_inode_operations = {
- &udf_dir_operations,
-#if CONFIG_UDF_RW == 1
- udf_create, /* create */
-#else
- NULL, /* create */
-#endif
- udf_lookup, /* lookup */
-#if CONFIG_UDF_RW == 1
- udf_link, /* link */
- udf_unlink, /* unlink */
- udf_symlink, /* symlink */
- udf_mkdir, /* mkdir */
- udf_rmdir, /* rmdir */
- udf_mknod, /* mknod */
- udf_rename, /* rename */
-#else
- NULL, /* link */
- NULL, /* unlink */
- NULL, /* symlink */
- NULL, /* mkdir */
- NULL, /* rmdir */
- NULL, /* mknod */
- NULL, /* rename */
-#endif
-};
-
/*
* udf_readdir
*