[PVFS2-CVS] commit by neill in pvfs2-1/src/kernel/linux-2.6: Makefile.in file.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6
In directory parlweb:/tmp/cvs-serv12082/src/kernel/linux-2.6

Modified Files:
	Makefile.in file.c 
Log Message:
- kernel updates to keep everything in sync with recent changes


Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/Makefile.in,v
diff -p -u -r1.10 -r1.11
--- Makefile.in	20 Apr 2004 00:25:25 -0000	1.10
+++ Makefile.in	20 May 2004 17:44:08 -0000	1.11
@@ -47,9 +47,11 @@ cmds = $(patsubst %,.%.cmd,$(objs) $(oth
 ifneq ($(KERNELRELEASE),)
 
 EXTRA_CFLAGS = \
+    -I$(absolute_src_dir)/ \
     -I$(absolute_src_dir)/include \
     -I$(absolute_src_dir)/src/io/dev \
-    -I$(absolute_src_dir)/src/common/quickhash
+    -I$(absolute_src_dir)/src/common/quickhash \
+    -I$(absolute_src_dir)/src/common/id-generator
 
 EXTRA_CFLAGS += @MMAP_RA_CACHE@
 

Index: file.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/file.c,v
diff -p -u -r1.67 -r1.68
--- file.c	18 May 2004 14:48:01 -0000	1.67
+++ file.c	20 May 2004 17:44:08 -0000	1.68
@@ -469,8 +469,8 @@ loff_t pvfs2_file_llseek(struct file *fi
                 "inode size is %lu\n", (int)offset, origin,
                 (unsigned long)file->f_dentry->d_inode->i_size);
 
-/*     return generic_file_llseek(file, offset, origin); */
-    return remote_llseek(file, offset, origin);
+    return generic_file_llseek(file, offset, origin);
+/*     return remote_llseek(file, offset, origin); */
 }
 
 struct file_operations pvfs2_file_operations =