[Lustre-cvs] b_unify: lustre/liblustre file.c

[Mike S. <sh...@us...>]

Update of /cvsroot/lustre/lustre/liblustre
In directory sc8-pr-cvs1:/tmp/cvs-serv7083/liblustre

Modified Files:
      Tag: b_unify
	file.c 
Log Message:
merge b_intent into b_unify, now that we know it passes

Index: file.c
===================================================================
RCS file: /cvsroot/lustre/lustre/liblustre/file.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.4.2.1
diff -u -w -b -B -p -r1.1.4.4 -r1.1.4.4.2.1
--- file.c	5 Jul 2003 22:46:21 -0000	1.1.4.4
+++ file.c	13 Jul 2003 00:32:10 -0000	1.1.4.4.2.1
@@ -145,7 +145,7 @@ int llu_create(struct inode *dir, struct
 
         it = dentry->d_it;
 
-        rc = ll_it_open_error(IT_OPEN_CREATE, it);
+        rc = ll_it_open_error(DISP_OPEN_CREATE, it);
         if (rc) {
                 LL_GET_INTENT(dentry, it);
                 ptlrpc_req_finished(it->it_data);
@@ -317,7 +317,7 @@ static int llu_file_open(struct inode *i
 #if 0
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu\n", inode->i_ino);
         LL_GET_INTENT(file->f_dentry, it);
-        rc = ll_it_open_error(IT_OPEN_OPEN, it);
+        rc = ll_it_open_error(DISP_OPEN_OPEN, it);
         if (rc)
                 RETURN(rc);
 #endif