Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-2590 lod: magic changed after swab
[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
d5d50e7
..
e6f324f
100644
(file)
--- a/
libcfs/libcfs/linux/linux-fs.c
+++ b/
libcfs/libcfs/linux/linux-fs.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.
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@
-26,7
+24,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-75,11
+73,12
@@
cfs_user_write (cfs_file_t *filp, const char *buf, size_t count, loff_t *offset)
fs = get_fs();
set_fs(KERNEL_DS);
fs = get_fs();
set_fs(KERNEL_DS);
- while (count > 0) {
- size =
filp->f_op->write(filp, (cha
r *)buf, count, offset);
+ while (
(ssize_t)
count > 0) {
+ size =
vfs_write(filp, (const char __use
r *)buf, count, offset);
if (size < 0)
break;
count -= size;
if (size < 0)
break;
count -= size;
+ buf += size;
size = 0;
}
set_fs(fs);
size = 0;
}
set_fs(fs);
@@
-88,6
+87,7
@@
cfs_user_write (cfs_file_t *filp, const char *buf, size_t count, loff_t *offset)
}
#if !(CFS_O_CREAT == O_CREAT && CFS_O_EXCL == O_EXCL && \
}
#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 &&\
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 &&\
@@
-96,9
+96,9
@@
cfs_user_write (cfs_file_t *filp, const char *buf, size_t count, loff_t *offset)
int cfs_oflags2univ(int flags)
{
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;
f |= (flags & O_CREAT) ? CFS_O_CREAT: 0;
f |= (flags & O_EXCL) ? CFS_O_EXCL: 0;
f |= (flags & O_NOCTTY) ? CFS_O_NOCTTY: 0;