[Pvfs2-cvs] commit by robl in pvfs2-1/src/kernel/linux-2.6: file.c

[CVS commit program]

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

Modified Files:
	file.c 
Log Message:
add a feature test for the FS_IOC_* flags.  These were turned into generic
versions sometime around 2.6.20 and don't exist on 2.6.6 (where I happen to be
compiling pvfs today...)


Index: file.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/file.c,v
diff -u -w -p -u -r1.138 -r1.139
--- file.c	21 Aug 2007 02:23:03 -0000	1.138
+++ file.c	31 Aug 2007 20:48:58 -0000	1.139
@@ -2848,6 +2848,18 @@ pvfs2_file_aio_write(struct kiocb *iocb,
 
 /** Perform a miscellaneous operation on a file.
  */
+
+#ifdef HAVE_NO_FS_IOC_FLAGS
+int pvfs2_ioctl(
+        struct inode *inode,
+        struct file *file,
+        unsigned int cmd,
+        unsigned long arg)
+{
+    return -ENOTTY;
+}
+#endif
+
 int pvfs2_ioctl(
     struct inode *inode,
     struct file *file,