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-506 kernel: FC15 - blkdev_get_by_dev() used instead of open_by_devnum().
[fs/lustre-release.git]
/
lustre
/
include
/
linux
/
lvfs.h
diff --git
a/lustre/include/linux/lvfs.h
b/lustre/include/linux/lvfs.h
index
5e35ef3
..
020e039
100644
(file)
--- a/
lustre/include/linux/lvfs.h
+++ b/
lustre/include/linux/lvfs.h
@@
-16,8
+16,8
@@
* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
* 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
[sun.com URL with a
- *
copy of GPLv2].
+ * 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
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-49,7
+49,6
@@
#include <linux/lustre_compat25.h>
#include <linux/lvfs_linux.h>
#else
#include <linux/lustre_compat25.h>
#include <linux/lvfs_linux.h>
#else
-struct group_info { /* unused */ };
#include <liblustre.h>
#endif
#include <liblustre.h>
#endif
@@
-62,7
+61,7
@@
struct lvfs_ucred {
__u32 luc_gid;
__u32 luc_fsuid;
__u32 luc_fsgid;
__u32 luc_gid;
__u32 luc_fsuid;
__u32 luc_fsgid;
-
__u32
luc_cap;
+
cfs_kernel_cap_t
luc_cap;
__u32 luc_umask;
struct group_info *luc_ginfo;
struct md_identity *luc_identity;
__u32 luc_umask;
struct group_info *luc_ginfo;
struct md_identity *luc_identity;
@@
-95,20
+94,26
@@
struct lvfs_run_ctxt {
#ifdef __KERNEL__
#ifdef __KERNEL__
-struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix);
+struct dentry *simple_mkdir(struct dentry *dir, struct vfsmount *mnt,
+ const char *name, int mode, int fix);
struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix);
struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix);
-int lustre_rename(struct dentry *dir, char *oldname, char *newname);
+int lustre_rename(struct dentry *dir, struct vfsmount *mnt, char *oldname,
+ char *newname);
int lustre_fread(struct file *file, void *buf, int len, loff_t *off);
int lustre_fwrite(struct file *file, const void *buf, int len, loff_t *off);
int lustre_fsync(struct file *file);
int lustre_fread(struct file *file, void *buf, int len, loff_t *off);
int lustre_fwrite(struct file *file, const void *buf, int len, loff_t *off);
int lustre_fsync(struct file *file);
-long l_readdir(struct file * file, struct list_head *dentry_list);
+long l_readdir(struct file * file, cfs_list_t *dentry_list);
+int l_notify_change(struct vfsmount *mnt, struct dentry *dchild,
+ struct iattr *newattrs);
+int simple_truncate(struct dentry *dir, struct vfsmount *mnt,
+ char *name, loff_t length);
static inline void l_dput(struct dentry *de)
{
if (!de || IS_ERR(de))
return;
//shrink_dcache_parent(de);
static inline void l_dput(struct dentry *de)
{
if (!de || IS_ERR(de))
return;
//shrink_dcache_parent(de);
- LASSERT(atomic_read(&de->d_count) > 0);
+ LASSERT(
cfs_
atomic_read(&de->d_count) > 0);
dput(de);
}
dput(de);
}
@@
-141,9
+146,9
@@
static inline struct dentry *ll_lookup_one_len(const char *fid_name,
static inline void ll_sleep(int t)
{
static inline void ll_sleep(int t)
{
-
set_current_state(
TASK_INTERRUPTIBLE);
-
schedule_timeout(t *
HZ);
-
set_current_state(
TASK_RUNNING);
+
cfs_set_current_state(CFS_
TASK_INTERRUPTIBLE);
+
cfs_schedule_timeout(t * CFS_
HZ);
+
cfs_set_current_state(CFS_
TASK_RUNNING);
}
#endif
}
#endif