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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
fs
/
jffs
/
inode-v23.c
diff --git
a/fs/jffs/inode-v23.c
b/fs/jffs/inode-v23.c
index
4d34ba6
..
1173626
100644
(file)
--- a/
fs/jffs/inode-v23.c
+++ b/
fs/jffs/inode-v23.c
@@
-315,7
+315,7
@@
jffs_setattr(struct dentry *dentry, struct iattr *iattr)
}
/* Write this node to the flash. */
}
/* Write this node to the flash. */
- if ((res = jffs_write_node(c, new_node, &raw_inode, f->name,
0
, recoverable, f)) < 0) {
+ if ((res = jffs_write_node(c, new_node, &raw_inode, f->name,
NULL
, recoverable, f)) < 0) {
D(printk("jffs_notify_change(): The write failed!\n"));
jffs_free_node(new_node);
D3(printk (KERN_NOTICE "n_c(): up biglock\n"));
D(printk("jffs_notify_change(): The write failed!\n"));
jffs_free_node(new_node);
D3(printk (KERN_NOTICE "n_c(): up biglock\n"));
@@
-323,7
+323,7
@@
jffs_setattr(struct dentry *dentry, struct iattr *iattr)
goto out;
}
goto out;
}
- jffs_insert_node(c, f, &raw_inode,
0
, new_node);
+ jffs_insert_node(c, f, &raw_inode,
NULL
, new_node);
mark_inode_dirty(inode);
D3(printk (KERN_NOTICE "n_c(): up biglock\n"));
mark_inode_dirty(inode);
D3(printk (KERN_NOTICE "n_c(): up biglock\n"));
@@
-879,14
+879,14
@@
jffs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
/* Write the new node to the flash. */
if ((result = jffs_write_node(c, node, &raw_inode,
/* Write the new node to the flash. */
if ((result = jffs_write_node(c, node, &raw_inode,
-
dentry->d_name.name, 0
, 0, NULL)) < 0) {
+
dentry->d_name.name, NULL
, 0, NULL)) < 0) {
D(printk("jffs_mkdir(): jffs_write_node() failed.\n"));
jffs_free_node(node);
goto jffs_mkdir_end;
}
/* Insert the new node into the file system. */
D(printk("jffs_mkdir(): jffs_write_node() failed.\n"));
jffs_free_node(node);
goto jffs_mkdir_end;
}
/* Insert the new node into the file system. */
- if ((result = jffs_insert_node(c,
0
, &raw_inode, dentry->d_name.name,
+ if ((result = jffs_insert_node(c,
NULL
, &raw_inode, dentry->d_name.name,
node)) < 0) {
goto jffs_mkdir_end;
}
node)) < 0) {
goto jffs_mkdir_end;
}
@@
-959,7
+959,7
@@
jffs_remove(struct inode *dir, struct dentry *dentry, int type)
struct jffs_file *dir_f; /* The file-to-remove's parent. */
struct jffs_file *del_f; /* The file to remove. */
struct jffs_node *del_node;
struct jffs_file *dir_f; /* The file-to-remove's parent. */
struct jffs_file *del_f; /* The file to remove. */
struct jffs_node *del_node;
- struct inode *inode =
0
;
+ struct inode *inode =
NULL
;
int result = 0;
D1({
int result = 0;
D1({
@@
-1041,7
+1041,7
@@
jffs_remove(struct inode *dir, struct dentry *dentry, int type)
raw_inode.deleted = 1;
/* Write the new node to the flash memory. */
raw_inode.deleted = 1;
/* Write the new node to the flash memory. */
- if (jffs_write_node(c, del_node, &raw_inode,
0, 0
, 1, del_f) < 0) {
+ if (jffs_write_node(c, del_node, &raw_inode,
NULL, NULL
, 1, del_f) < 0) {
jffs_free_node(del_node);
result = -EIO;
goto jffs_remove_end;
jffs_free_node(del_node);
result = -EIO;
goto jffs_remove_end;
@@
-1049,7
+1049,7
@@
jffs_remove(struct inode *dir, struct dentry *dentry, int type)
/* Update the file. This operation will make the file disappear
from the in-memory file system structures. */
/* Update the file. This operation will make the file disappear
from the in-memory file system structures. */
- jffs_insert_node(c, del_f, &raw_inode,
0
, del_node);
+ jffs_insert_node(c, del_f, &raw_inode,
NULL
, del_node);
dir->i_ctime = dir->i_mtime = CURRENT_TIME;
mark_inode_dirty(dir);
dir->i_ctime = dir->i_mtime = CURRENT_TIME;
mark_inode_dirty(dir);
@@
-1070,7
+1070,7
@@
jffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
{
struct jffs_raw_inode raw_inode;
struct jffs_file *dir_f;
{
struct jffs_raw_inode raw_inode;
struct jffs_file *dir_f;
- struct jffs_node *node =
0
;
+ struct jffs_node *node =
NULL
;
struct jffs_control *c;
struct inode *inode;
int result = 0;
struct jffs_control *c;
struct inode *inode;
int result = 0;
@@
-1127,7
+1127,7
@@
jffs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t rdev)
}
/* Insert the new node into the file system. */
}
/* Insert the new node into the file system. */
- if ((err = jffs_insert_node(c,
0
, &raw_inode, dentry->d_name.name,
+ if ((err = jffs_insert_node(c,
NULL
, &raw_inode, dentry->d_name.name,
node)) < 0) {
result = err;
goto jffs_mknod_end;
node)) < 0) {
result = err;
goto jffs_mknod_end;
@@
-1237,7
+1237,7
@@
jffs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
}
/* Insert the new node into the file system. */
}
/* Insert the new node into the file system. */
- if ((err = jffs_insert_node(c,
0
, &raw_inode, dentry->d_name.name,
+ if ((err = jffs_insert_node(c,
NULL
, &raw_inode, dentry->d_name.name,
node)) < 0) {
goto jffs_symlink_end;
}
node)) < 0) {
goto jffs_symlink_end;
}
@@
-1333,14
+1333,14
@@
jffs_create(struct inode *dir, struct dentry *dentry, int mode,
/* Write the new node to the flash. */
if ((err = jffs_write_node(c, node, &raw_inode,
/* Write the new node to the flash. */
if ((err = jffs_write_node(c, node, &raw_inode,
- dentry->d_name.name,
0
, 0, NULL)) < 0) {
+ dentry->d_name.name,
NULL
, 0, NULL)) < 0) {
D(printk("jffs_create(): jffs_write_node() failed.\n"));
jffs_free_node(node);
goto jffs_create_end;
}
/* Insert the new node into the file system. */
D(printk("jffs_create(): jffs_write_node() failed.\n"));
jffs_free_node(node);
goto jffs_create_end;
}
/* Insert the new node into the file system. */
- if ((err = jffs_insert_node(c,
0
, &raw_inode, dentry->d_name.name,
+ if ((err = jffs_insert_node(c,
NULL
, &raw_inode, dentry->d_name.name,
node)) < 0) {
goto jffs_create_end;
}
node)) < 0) {
goto jffs_create_end;
}
@@
-1501,7
+1501,7
@@
jffs_file_write(struct file *filp, const char *buf, size_t count,
pos += err;
/* Insert the new node into the file system. */
pos += err;
/* Insert the new node into the file system. */
- if ((err = jffs_insert_node(c, f, &raw_inode,
0
, node)) < 0) {
+ if ((err = jffs_insert_node(c, f, &raw_inode,
NULL
, node)) < 0) {
goto out;
}
goto out;
}
@@
-1750,7
+1750,7
@@
jffs_delete_inode(struct inode *inode)
lock_kernel();
inode->i_size = 0;
inode->i_blocks = 0;
lock_kernel();
inode->i_size = 0;
inode->i_blocks = 0;
- inode->u.generic_ip =
0
;
+ inode->u.generic_ip =
NULL
;
clear_inode(inode);
if (inode->i_nlink == 0) {
c = (struct jffs_control *) inode->i_sb->s_fs_info;
clear_inode(inode);
if (inode->i_nlink == 0) {
c = (struct jffs_control *) inode->i_sb->s_fs_info;