LU-506 kernel: FC15 - file_operations relate changes.

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-module.c

diff --git a/libcfs/libcfs/linux/linux-module.c b/libcfs/libcfs/linux/linux-module.c
index d290172..1824d88 100644 (file)
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -131,9 +131,14 @@ libcfs_psdev_release(struct inode * inode, struct file * file)
        return rc;
 }
 
-static int
-libcfs_ioctl(struct inode *inode, struct file *file,
-            unsigned int cmd, unsigned long arg)
+
+#ifdef HAVE_UNLOCKED_IOCTL
+static long libcfs_ioctl(struct file *file,
+                         unsigned int cmd, unsigned long arg)
+#else
+static int  libcfs_ioctl(struct inode *inode, struct file *file,
+                         unsigned int cmd, unsigned long arg)
+#endif
 {
        struct cfs_psdev_file    pfile;
        int    rc = 0;
@@ -172,9 +177,13 @@ libcfs_ioctl(struct inode *inode, struct file *file,
 }
 
 static struct file_operations libcfs_fops = {
-       ioctl:   libcfs_ioctl,
-       open:    libcfs_psdev_open,
-       release: libcfs_psdev_release
+#ifdef HAVE_UNLOCKED_IOCTL
+        unlocked_ioctl: libcfs_ioctl,
+#else
+        ioctl:          libcfs_ioctl,
+#endif
+        open :          libcfs_psdev_open,
+        release :       libcfs_psdev_release
 };
 
 cfs_psdev_t libcfs_dev = {