git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
fs
/
ocfs2
/
dlm
/
dlmfs.c
diff --git
a/fs/ocfs2/dlm/dlmfs.c
b/fs/ocfs2/dlm/dlmfs.c
index
856c971
..
7e88e24
100644
(file)
--- a/
fs/ocfs2/dlm/dlmfs.c
+++ b/
fs/ocfs2/dlm/dlmfs.c
@@
-116,7
+116,7
@@
static int dlmfs_file_open(struct inode *inode,
* doesn't make sense for LVB writes. */
file->f_flags &= ~O_APPEND;
* doesn't make sense for LVB writes. */
file->f_flags &= ~O_APPEND;
- fp = kmalloc(sizeof(*fp), GFP_
NOFS
);
+ fp = kmalloc(sizeof(*fp), GFP_
KERNEL
);
if (!fp) {
status = -ENOMEM;
goto bail;
if (!fp) {
status = -ENOMEM;
goto bail;
@@
-196,7
+196,7
@@
static ssize_t dlmfs_file_read(struct file *filp,
else
readlen = count - *ppos;
else
readlen = count - *ppos;
- lvb_buf = kmalloc(readlen, GFP_
NOFS
);
+ lvb_buf = kmalloc(readlen, GFP_
KERNEL
);
if (!lvb_buf)
return -ENOMEM;
if (!lvb_buf)
return -ENOMEM;
@@
-240,7
+240,7
@@
static ssize_t dlmfs_file_write(struct file *filp,
else
writelen = count - *ppos;
else
writelen = count - *ppos;
- lvb_buf = kmalloc(writelen, GFP_
NOFS
);
+ lvb_buf = kmalloc(writelen, GFP_
KERNEL
);
if (!lvb_buf)
return -ENOMEM;
if (!lvb_buf)
return -ENOMEM;
@@
-335,6
+335,7
@@
static struct inode *dlmfs_get_root_inode(struct super_block *sb)
inode->i_mode = mode;
inode->i_uid = current->fsuid;
inode->i_gid = current->fsgid;
inode->i_mode = mode;
inode->i_uid = current->fsuid;
inode->i_gid = current->fsgid;
+ inode->i_blksize = PAGE_CACHE_SIZE;
inode->i_blocks = 0;
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
inode->i_blocks = 0;
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@
-361,6
+362,7
@@
static struct inode *dlmfs_get_inode(struct inode *parent,
inode->i_mode = mode;
inode->i_uid = current->fsuid;
inode->i_gid = current->fsgid;
inode->i_mode = mode;
inode->i_uid = current->fsuid;
inode->i_gid = current->fsgid;
+ inode->i_blksize = PAGE_CACHE_SIZE;
inode->i_blocks = 0;
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
inode->i_blocks = 0;
inode->i_mapping->backing_dev_info = &dlmfs_backing_dev_info;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
@@
-572,10
+574,10
@@
static struct inode_operations dlmfs_file_inode_operations = {
.getattr = simple_getattr,
};
.getattr = simple_getattr,
};
-static
int
dlmfs_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct super_block *
dlmfs_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
{
{
- return get_sb_nodev(fs_type, flags, data, dlmfs_fill_super
, mnt
);
+ return get_sb_nodev(fs_type, flags, data, dlmfs_fill_super);
}
static struct file_system_type dlmfs_fs_type = {
}
static struct file_system_type dlmfs_fs_type = {