[Libsysio-commit] b_lustre: libsysio/drivers/native fs_native.c

[Mei <me...@us...>]

Update of /cvsroot/libsysio/libsysio/drivers/native
In directory sc8-pr-cvs1:/tmp/cvs-serv25257/drivers/native

Modified Files:
      Tag: b_lustre
	fs_native.c 
Log Message:
merge changes from HEAD to b_lustre



Index: fs_native.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -w -b -B -p -r1.11.2.2 -r1.11.2.3
--- fs_native.c	19 Jun 2003 12:24:30 -0000	1.11.2.2
+++ fs_native.c	15 Aug 2003 07:43:15 -0000	1.11.2.3
@@ -116,9 +116,19 @@ do {                                    
 	(dest)->st_gen     = (src)->st_gen;     \
 } while (0);
 
+/* SYS_lseek has a different interface on alpha
+ */
+#define CALL_LSEEK(fd, off, rc, wh)             \
+	(rc = syscall(SYS_lseek, fd, off, wh))
+
 #else 
+
 #define __native_stat intnl_stat
 #define COPY_STAT(src, dest) *(dest) = *(src) 
+
+#define CALL_LSEEK(fd, off, rc, wh)              \
+	(syscall(SYS_lseek, fd, off, &rc, wh))
+
 #endif
 
 #if defined(USE_NATIVE_STAT)
@@ -151,6 +161,9 @@ do {                                    
 struct native_inode_identifier {
 	dev_t	dev;					/* device number */
 	ino_t	ino;					/* i-number */
+#ifdef HAVE_GENERATION
+	unsigned int gen;                               /* generation number */
+#endif
 };
 
 /*
@@ -290,10 +303,12 @@ static int
 native_fstat(int fd, struct intnl_stat *buf)
 {
 	int	err;
+	struct __native_stat stbuf;
 
-	err = syscall(__SYS_FSTAT, fd, buf);
+	err = syscall(__SYS_FSTAT, fd, &stbuf);
 	if (err)
 		err = -errno;
+	COPY_STAT(&stbuf, buf);
 
 	return err;
 }
@@ -310,8 +325,12 @@ native_i_new(struct filesys *fs, struct 
 	nino = malloc(sizeof(struct native_inode));
 	if (!nino)
 		return NULL;
+	bzero(&nino->ni_ident, sizeof(nino->ni_ident));
 	nino->ni_ident.dev = buf->st_dev;
 	nino->ni_ident.ino = buf->st_ino;
+#ifdef HAVE_GENERATION
+	nino->ni_ident.gen = buf->st_gen;
+#endif
 	nino->ni_fileid.fid_data = &nino->ni_ident;
 	nino->ni_fileid.fid_len = sizeof(nino->ni_ident);
 	nino->ni_fd = -1;
@@ -496,6 +515,27 @@ native_fsswop_mount(const char *source,
 	return err;
 }
 
+static int
+native_i_invalid(struct inode *inop, struct intnl_stat stbuf)
+{
+	/*
+	 * Validate passed in inode against stat struct info
+	 */
+	struct native_inode *nino = I2NI(inop);
+	
+	if ((nino->ni_ident.dev != stbuf.st_dev ||
+	     nino->ni_ident.ino != stbuf.st_ino ||
+#ifdef HAVE_GENERATION
+	     nino->ni_ident.gen != stbuf.st_gen ||
+#endif
+	     ((inop)->i_mode & S_IFMT) != (stbuf.st_mode & S_IFMT)) ||
+	    (((inop)->i_rdev != stbuf.st_rdev) &&
+	       (S_ISCHR((inop)->i_mode) || S_ISBLK((inop)->i_mode))))
+		return 1;
+	
+	return 0;
+}
+
 /*
  * Find, and validate, or create i-node by host-relative path. Returned i-node
  * is referenced.
@@ -525,11 +565,7 @@ native_iget(struct filesys *fs,
 	 * Validate?
 	 */
 	if (*inop) {
-		struct native_inode *nino = I2NI(*inop);
-
-		if (nino->ni_ident.dev == stbuf.st_dev &&
-		    nino->ni_ident.ino == stbuf.st_ino &&
-		    ((*inop)->i_mode & stbuf.st_mode) == (*inop)->i_mode)
+		if (!native_i_invalid(*inop, stbuf))
 			return 0;
 		/*
 		 * Invalidate.
@@ -540,23 +576,40 @@ native_iget(struct filesys *fs,
 	/*
 	 * I-node is not already known. Find or create it.
 	 */
+	bzero(&ident, sizeof(ident)); 
 	ident.dev = stbuf.st_dev;
 	ident.ino = stbuf.st_ino;
+#ifdef HAVE_GENERATION
+	ident.gen = stbuf.st_gen;
+#endif
 	fileid.fid_data = &ident;
 	fileid.fid_len = sizeof(ident);
 	ino = _sysio_i_find(fs, stbuf.st_ino, &fileid);
-	if (!ino) {
-		ino = native_i_new(fs, &stbuf);
-		if (!ino)
-			err = -ENOMEM;
-	} else if (forced) {
+	if (ino && forced) {
 		/*
 		 * Insertion was forced but it's already present!
 		 */
+		if (native_i_invalid(ino, stbuf)) {
+			/* 
+			 * Cached inode has stale attrs
+			 * make way for the new one
+			 */
 		I_RELE(ino);
-		err = -EEXIST;
+			_sysio_i_undead(ino);
+			ino = NULL;
+		} else
+			/* 
+			 * OK to reuse cached inode
+			 */
+			goto out;
 	}
 
+	if (!ino) {
+		ino = native_i_new(fs, &stbuf);
+		if (!ino)
+			err = -ENOMEM;
+	}
+out:
 	if (!err)
 		*inop = ino;
 	return err;
@@ -788,10 +841,9 @@ native_getdirentries(struct inode *ino,
 
 	result = *basep;
 	if (*basep != nino->ni_fpos &&
-	    syscall(SYS_lseek,
-		    nino->ni_fd,
+	    CALL_LSEEK(nino->ni_fd,
 		    *basep,
-		    &result,
+		       result,
 		    SEEK_SET) == -1)
 		return -errno;
 	nino->ni_fpos = result;
@@ -965,7 +1017,7 @@ static int
 native_inop_unlink(struct pnode *pno)
 {
 	char	*path;
-	int	err;
+	int	err = 0;
 
 	path = _sysio_pb_path(pno->p_base, '/');
 	if (!path)
@@ -983,7 +1035,8 @@ native_inop_unlink(struct pnode *pno)
 	 * (usually .NFSXXXXXX, where the X's are replaced by the PID and some
 	 * unique characters) in order to simulate the proper semantic.
 	 */
-	err = syscall(SYS_unlink, path);
+	if (syscall(SYS_unlink, path) != 0)
+		err = -errno;
 	free(path);
 	return err;
 }
@@ -1033,10 +1086,9 @@ doio(ssize_t (*f)(int, const struct iove
 	    !(S_ISCHR(ino->i_mode) ||
 	      S_ISSOCK(ino->i_mode) ||
 	      S_ISFIFO(ino->i_mode)) &&
-	    syscall(SYS_lseek,
-		    nino->ni_fd,
+	    CALL_LSEEK(nino->ni_fd,
 		    ioctx->ioctx_offset,
-		    &result,
+		       result,
 		    SEEK_SET) == -1) {
 		ioctx->ioctx_cc = -1;
 		ioctx->ioctx_errno = errno;