Update of /cvsroot/linux-vax/kernel-2.4/arch/parisc/hpux
In directory usw-pr-cvs1:/tmp/cvs-serv15874/parisc/hpux
Modified Files:
entry_hpux.S fs.c sys_hpux.c
Log Message:
synch 2.4.15 commit 30
Index: entry_hpux.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/parisc/hpux/entry_hpux.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- entry_hpux.S 14 Jan 2001 19:57:15 -0000 1.1.1.1
+++ entry_hpux.S 9 Apr 2002 17:07:19 -0000 1.2
@@ -6,8 +6,6 @@
*/
-#define ASSEMBLY
-
#include <linux/sys.h>
#include <linux/linkage.h>
#include <asm/unistd.h>
Index: fs.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/parisc/hpux/fs.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fs.c 14 Jan 2001 19:57:16 -0000 1.1.1.1
+++ fs.c 9 Apr 2002 17:07:19 -0000 1.2
@@ -52,7 +52,7 @@
#define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
-static int filldir(void * __buf, const char * name, int namlen, off_t offset, ino_t ino)
+static int filldir(void * __buf, const char * name, int namlen, loff_t offset, ino_t ino)
{
struct hpux_dirent * dirent;
struct getdents_callback * buf = (struct getdents_callback *) __buf;
Index: sys_hpux.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/parisc/hpux/sys_hpux.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- sys_hpux.c 14 Jan 2001 19:57:17 -0000 1.1.1.1
+++ sys_hpux.c 9 Apr 2002 17:07:19 -0000 1.2
@@ -109,9 +109,11 @@
lock_kernel();
s = get_super(to_kdev_t(dev));
+ unlock_kernel();
if (s == NULL)
goto out;
err = vfs_statfs(s, &sbuf);
+ drop_super(s);
if (err)
goto out;
@@ -124,7 +126,6 @@
/* Changed to hpux_ustat: */
err = copy_to_user(ubuf,&tmp,sizeof(struct hpux_ustat)) ? -EFAULT : 0;
out:
- unlock_kernel();
return err;
}
|
