patch-2.1.87 linux/fs/umsdos/symlink.c
Next file: linux/fs/vfat/namei.c
Previous file: linux/fs/umsdos/rdir.c
Back to the patch index
Back to the overall index
- Lines: 139
- Date:
Thu Feb 12 13:36:57 1998
- Orig file:
v2.1.86/linux/fs/umsdos/symlink.c
- Orig date:
Mon Jun 16 16:35:59 1997
diff -u --recursive --new-file v2.1.86/linux/fs/umsdos/symlink.c linux/fs/umsdos/symlink.c
@@ -22,38 +22,99 @@
#define PRINTK(x)
#define Printk(x) printk x
+static struct file_operations umsdos_symlink_operations;
+
+
/*
Read the data associate with the symlink.
Return length read in buffer or a negative error code.
+ FIXME, this is messed up.
+
+ /mn/ WIP fixing...
*/
static int umsdos_readlink_x (
- struct inode *inode,
+ struct dentry *dentry,
char *buffer,
- long (*msdos_read)(struct inode *, struct file *, char *, unsigned long),
int bufsiz)
{
- int ret = inode->i_size;
+ int ret = dentry->d_inode->i_size;
+ loff_t loffs = 0;
struct file filp;
+
+ memset (&filp, 0, sizeof (filp));
+
filp.f_pos = 0;
filp.f_reada = 0;
+ filp.f_flags = O_RDONLY;
+ filp.f_dentry = dentry;
+ filp.f_op = &umsdos_symlink_operations; /* /mn/ - we have to fill it with dummy values so we won't segfault */
+
if (ret > bufsiz) ret = bufsiz;
- if ((*msdos_read) (inode, &filp, buffer,ret) != ret){
+
+ Printk ((KERN_WARNING "umsdos_readlink_x /mn/: Checkin: filp=%p, buffer=%p, size=%ld, offs=%d\n", &filp, buffer, ret, loffs));
+ Printk ((KERN_WARNING " f_op=%p\n", filp.f_op));
+ Printk ((KERN_WARNING " inode=%d, i_size=%d\n", filp.f_dentry->d_inode->i_ino,filp.f_dentry->d_inode->i_size));
+ Printk ((KERN_WARNING " f_pos=%ld\n", filp.f_pos));
+ Printk ((KERN_WARNING " name=%12s\n", filp.f_dentry->d_name.name));
+ Printk ((KERN_WARNING " i_binary(sb)=%d\n", MSDOS_I(filp.f_dentry->d_inode)->i_binary ));
+ Printk ((KERN_WARNING " f_count=%d, f_flags=%d\n", filp.f_count, filp.f_flags));
+ Printk ((KERN_WARNING " f_owner=%d\n", filp.f_owner));
+ Printk ((KERN_WARNING " f_version=%ld\n", filp.f_version));
+ Printk ((KERN_WARNING " f_reada=%ld, f_ramax=%ld, f_raend=%ld, f_ralen=%ld, f_rawin=%ld\n", filp.f_reada, filp.f_ramax, filp.f_raend, filp.f_ralen, filp.f_rawin));
+
+
+ /* FIXME */
+ Printk (("umsdos_readlink_x: FIXME /mn/: running fat_file_read (%p, %p, %d, %ld)\n", &filp, buffer, ret, loffs));
+ if (fat_file_read (&filp, buffer, (size_t) ret, &loffs) != ret){
ret = -EIO;
}
+#if 0
+ {
+ struct umsdos_dirent *mydirent=buffer;
+
+ Printk ((KERN_DEBUG " (DDD) uid=%d\n",mydirent->uid));
+ Printk ((KERN_DEBUG " (DDD) gid=%d\n",mydirent->gid));
+ Printk ((KERN_DEBUG " (DDD) name=>%20s<\n",mydirent->name));
+ }
+#endif
+
+ Printk (("umsdos_readlink_x: FIXME /mn/: fat_file_read returned offs=%ld ret=%d\n", loffs, ret));
return ret;
}
-static int UMSDOS_readlink(struct inode * inode, char * buffer, int buflen)
+
+
+static int UMSDOS_readlink(struct dentry *dentry, char *buffer, int buflen)
{
int ret;
- ret = umsdos_readlink_x (inode,buffer,fat_file_read,buflen);
- PRINTK (("readlink %d %x bufsiz %d\n",ret,inode->i_mode,buflen));
- iput(inode);
+ Printk (("UMSDOS_readlink: calling umsdos_readlink_x for %20s\n", dentry->d_name.name));
+ ret = umsdos_readlink_x (dentry, buffer, buflen);
+ Printk (("readlink %d bufsiz %d\n", ret, buflen));
+ /* dput(dentry); / * FIXME /mn/ */
+ Printk (("UMSDOS_readlink /mn/: FIXME! skipped dput(dentry). returning %d\n", ret));
return ret;
}
+static struct dentry *UMSDOS_followlink(struct dentry * dentry, struct dentry * base)
+{
+ int ret;
+ char symname[256];
+ struct inode *inode = dentry->d_inode;
+ mm_segment_t old_fs = get_fs();
+ Printk ((KERN_ERR "UMSDOS_followlink /mn/: (%s/%s)\n", dentry->d_parent->d_name.name, dentry->d_name.name));
+
+ set_fs (KERNEL_DS); /* we read into kernel space */
+ ret = umsdos_readlink_x (dentry, &symname, 256);
+ set_fs (old_fs);
+
+ base = creat_dentry (symname, ret, NULL);
+/* UMSDOS_lookup (dentry->d_parent->d_inode, base);*/
+
+ return base;
+}
+
static struct file_operations umsdos_symlink_operations = {
NULL, /* lseek - default */
NULL, /* read */
@@ -67,8 +128,9 @@
NULL /* fsync */
};
+
struct inode_operations umsdos_symlink_inode_operations = {
- &umsdos_symlink_operations, /* default file operations */
+ NULL, /* default file operations */
NULL, /* create */
NULL, /* lookup */
NULL, /* link */
@@ -79,11 +141,16 @@
NULL, /* mknod */
NULL, /* rename */
UMSDOS_readlink, /* readlink */
- NULL, /* readpage */
+ NULL/*UMSDOS_followlink*/, /* followlink */ /* /mn/ is this REALLY needed ? I recall seeing it working w/o it... */
+ generic_readpage, /* readpage */ /* in original NULL. changed to generic_readpage. FIXME? /mn/ */
NULL, /* writepage */
- NULL, /* bmap */
+ fat_bmap, /* bmap */ /* in original NULL. changed to fat_bmap. FIXME? /mn/ */
NULL, /* truncate */
- NULL /* permission */
+ NULL, /* permission */
+ NULL, /* smap */
+ NULL, /* updatepage */
+ NULL /* revalidate */
+
};
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov