[Libsysio-commit] b_lustre: libsysio/drivers/yod module.mk fs_yod.c Makefile.am

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

Update of /cvsroot/libsysio/libsysio/drivers/yod
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/drivers/yod

Modified Files:
      Tag: b_lustre
	fs_yod.c 
Added Files:
      Tag: b_lustre
	module.mk 
Removed Files:
      Tag: b_lustre
	Makefile.am 
Log Message:
merge HEAD to b_lustre



--- NEW FILE ---
if WITH_CPLANT_YOD
YOD_SRCS = drivers/yod/fs_yod.c
YOD_DRIVER_FLAGS = -DCPLANT_YOD
else
YOD_SRCS = 
YOD_DRIVER_FLAGS = 
endif

# Bring yod files along in the distribution regardless
YOD_EXTRA = include/cplant-yod.h drivers/yod/fs_yod.h drivers/yod/module.mk

Index: fs_yod.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/yod/fs_yod.c,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -w -b -B -p -r1.2.2.2 -r1.2.2.3
--- fs_yod.c	1 Nov 2003 03:08:22 -0000	1.2.2.2
+++ fs_yod.c	11 Jan 2004 05:55:53 -0000	1.2.2.3
@@ -904,12 +904,14 @@ yod_inop_close(struct inode *ino)
 	if (nino->ni_fd < 0)
 		abort();
 
-	err = close_yod(nino->ni_fd);
-	if (err)
-		return -errno;
 	assert(nino->ni_nopens);
 	if (--nino->ni_nopens)
 		return 0;
+
+	err = close_yod(nino->ni_fd);
+	if (err)
+		return -errno;
+
 	nino->ni_fd = -1;
 	nino->ni_fpos = 0;
 	return 0;

--- Makefile.am DELETED ---