LU-2311 osd-ldiskfs: fix link refcounting

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

diff --git a/libcfs/libcfs/linux/linux-fs.c b/libcfs/libcfs/linux/linux-fs.c
index 3b15576..21fa32c 100644 (file)
--- a/libcfs/libcfs/linux/linux-fs.c
+++ b/libcfs/libcfs/linux/linux-fs.c
@@ -1,3 +1,37 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ */
+
 # define DEBUG_SUBSYSTEM S_LNET
 
 #include <linux/fs.h>
@@ -7,51 +41,33 @@
 
 #include <libcfs/libcfs.h>
 
-cfs_file_t *
-cfs_filp_open (const char *name, int flags, int mode, int *err)
-{
-       /* XXX
-        * Maybe we need to handle flags and mode in the future
-        */
-       cfs_file_t      *filp = NULL;
-
-       filp = filp_open(name, flags, mode);
-       if (IS_ERR(filp)) {
-               int rc;
-
-               rc = PTR_ERR(filp);
-               printk(KERN_ERR "LustreError: can't open %s file: err %d\n",
-                               name, rc);
-               if (err)
-                       *err = rc;
-               filp = NULL;
-       }
-       return filp;
-}
-
 /* write a userspace buffer to disk.
  * NOTE: this returns 0 on success, not the number of bytes written. */
 ssize_t
-cfs_user_write (cfs_file_t *filp, const char *buf, size_t count, loff_t *offset)
+filp_user_write(struct file *filp, const void *buf, size_t count,
+               loff_t *offset)
 {
        mm_segment_t fs;
        ssize_t size = 0;
 
        fs = get_fs();
        set_fs(KERNEL_DS);
-       while (count > 0) {
-               size = filp->f_op->write(filp, (char *)buf, count, offset);
+       while ((ssize_t)count > 0) {
+               size = vfs_write(filp, (const void __user *)buf, count, offset);
                if (size < 0)
                        break;
                count -= size;
+                buf += size;
                size = 0;
        }
        set_fs(fs);
 
        return size;
 }
+EXPORT_SYMBOL(filp_user_write);
 
 #if !(CFS_O_CREAT == O_CREAT && CFS_O_EXCL == O_EXCL &&        \
+     CFS_O_NOACCESS == O_NOACCESS &&\
      CFS_O_TRUNC == O_TRUNC && CFS_O_APPEND == O_APPEND &&\
      CFS_O_NONBLOCK == O_NONBLOCK && CFS_O_NDELAY == O_NDELAY &&\
      CFS_O_SYNC == O_SYNC && CFS_O_ASYNC == FASYNC &&\
@@ -60,9 +76,9 @@ cfs_user_write (cfs_file_t *filp, const char *buf, size_t count, loff_t *offset)
 
 int cfs_oflags2univ(int flags)
 {
-       int f; 
-       
-       f = flags & O_ACCMODE;
+       int f;
+
+       f = flags & O_NOACCESS;
        f |= (flags & O_CREAT) ? CFS_O_CREAT: 0;
        f |= (flags & O_EXCL) ? CFS_O_EXCL: 0;
        f |= (flags & O_NOCTTY) ? CFS_O_NOCTTY: 0;
@@ -85,16 +101,13 @@ int cfs_oflags2univ(int flags)
        return (flags);
 }
 #endif
+EXPORT_SYMBOL(cfs_oflags2univ);
 
-/* 
+/*
  * XXX Liang: we don't need cfs_univ2oflags() now.
  */
 int cfs_univ2oflags(int flags)
 {
        return (flags);
 }
-
-EXPORT_SYMBOL(cfs_filp_open);
-EXPORT_SYMBOL(cfs_user_write);
-EXPORT_SYMBOL(cfs_oflags2univ);
 EXPORT_SYMBOL(cfs_univ2oflags);