[SSI] openssi/kernel/fs/devpts inode.c,1.3,1.4

Update of /cvsroot/ssic-linux/openssi/kernel/fs/devpts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23079/fs/devpts

Modified Files:
        inode.c 
Log Message:
Make fs/devpts compile.


Index: inode.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/fs/devpts/inode.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inode.c     20 Oct 2004 03:23:35 -0000      1.3
+++ inode.c     4 Nov 2004 03:46:51 -0000       1.4
@@ -56,13 +56,15 @@
 {
        struct ssipty_readdir_cookie *cp;
 
-       cp = kmalloc(sizeof(*cp), GFP_KERNEL);
-       filp->private_data = cp;
-       if (cp == NULL)
+       cp = kmalloc(sizeof(*cp), GFP_USER);
+       file->private_data = cp;
+       if (!cp)
                return -ENOMEM;
        cp->oldpos = 0;
        cp->entries_len = 0;
-       cp->entries = NULL;
+       cp->entries = kmalloc(SSIPTY_BUFLEN, GFP_USER);
+       if (!cp->entries)
+               return -ENOMEM;
 
        return 0;
 }
@@ -71,7 +73,6 @@
 devpts_root_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
        struct inode * inode = filp->f_dentry->d_inode;
-       struct devpts_sb_info * sbi = SBI(filp->f_dentry->d_inode->i_sb);
        off_t nr;
        char numbuf[16];
        struct ssipty_readdir_cookie *cp;
@@ -98,8 +99,8 @@
                cp = filp->private_data;
                if (nr != cp->oldpos) {
                        cp->start_index = 0;
-                       cp->entries_len = sbi->max_ptys;
-                       ret = ssipty_readdir(nr - 2, &cp->entries,
+                       cp->entries_len = SSIPTY_PTYS;
+                       ret = ssipty_readdir(nr - 2, cp->entries,
                                             &cp->entries_len);
                        if (ret < 0) {
                                cp->oldpos = 0;
@@ -130,7 +131,7 @@
 {
        struct ssipty_readdir_cookie *cp = file->private_data;
 
-       if (cp != NULL) {
+       if (cp) {
                kfree(cp->entries);
                kfree(cp);
        }
@@ -139,7 +140,7 @@
 }
 
 static int
-devpts_revalidate(struct dentry *dentry, int flags)
+devpts_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
        unsigned int entry;
        int i;
@@ -411,7 +412,7 @@
        dev_t device;
 
        if (!inode) {
-               inode = new_inode(sb);
+               inode = new_inode(devpts_mnt->mnt_sb);
                if (!inode)
                        return NULL;
        }



-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click