LU-2800 autoconf: remove obsolete autoconf options

[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..cd98ad9 100644 (file)
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -131,9 +131,8 @@ 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)
+static long libcfs_ioctl(struct file *file,
+                        unsigned int cmd, unsigned long arg)
 {
        struct cfs_psdev_file    pfile;
        int    rc = 0;
@@ -172,9 +171,9 @@ 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
+       unlocked_ioctl: libcfs_ioctl,
+       open :          libcfs_psdev_open,
+       release :       libcfs_psdev_release
 };
 
 cfs_psdev_t libcfs_dev = {