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
This commit was manufactured by cvs2svn to create branch 'vserver'.
[linux-2.6.git]
/
fs
/
ufs
/
dir.c
diff --git
a/fs/ufs/dir.c
b/fs/ufs/dir.c
index
da9d316
..
7c10c68
100644
(file)
--- a/
fs/ufs/dir.c
+++ b/
fs/ufs/dir.c
@@
-31,6
+31,9
@@
#define UFSD(x)
#endif
#define UFSD(x)
#endif
+static int
+ufs_check_dir_entry (const char *, struct inode *, struct ufs_dir_entry *,
+ struct buffer_head *, unsigned long);
/*
/*
@@
-292,9
+295,10
@@
failed:
return NULL;
}
return NULL;
}
-int ufs_check_dir_entry (const char * function, struct inode * dir,
- struct ufs_dir_entry * de, struct buffer_head * bh,
- unsigned long offset)
+static int
+ufs_check_dir_entry (const char *function, struct inode *dir,
+ struct ufs_dir_entry *de, struct buffer_head *bh,
+ unsigned long offset)
{
struct super_block *sb = dir->i_sb;
const char *error_msg = NULL;
{
struct super_block *sb = dir->i_sb;
const char *error_msg = NULL;
@@
-458,7
+462,7
@@
int ufs_add_link(struct dentry *dentry, struct inode *inode)
if (IS_DIRSYNC(dir))
sync_dirty_buffer(bh);
brelse (bh);
if (IS_DIRSYNC(dir))
sync_dirty_buffer(bh);
brelse (bh);
- dir->i_mtime = dir->i_ctime = CURRENT_TIME;
+ dir->i_mtime = dir->i_ctime = CURRENT_TIME
_SEC
;
dir->i_version++;
mark_inode_dirty(dir);
dir->i_version++;
mark_inode_dirty(dir);
@@
-487,7
+491,7
@@
int ufs_delete_entry (struct inode * inode, struct ufs_dir_entry * dir,
UFSD(("ino %u, reclen %u, namlen %u, name %s\n",
fs32_to_cpu(sb, de->d_ino),
UFSD(("ino %u, reclen %u, namlen %u, name %s\n",
fs32_to_cpu(sb, de->d_ino),
- fs16to_cpu(sb, de->d_reclen),
+ fs16
_
to_cpu(sb, de->d_reclen),
ufs_get_de_namlen(sb, de), de->d_name))
while (i < bh->b_size) {
ufs_get_de_namlen(sb, de), de->d_name))
while (i < bh->b_size) {
@@
-501,7
+505,7
@@
int ufs_delete_entry (struct inode * inode, struct ufs_dir_entry * dir,
fs16_to_cpu(sb, dir->d_reclen));
dir->d_ino = 0;
inode->i_version++;
fs16_to_cpu(sb, dir->d_reclen));
dir->d_ino = 0;
inode->i_version++;
- inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+ inode->i_ctime = inode->i_mtime = CURRENT_TIME
_SEC
;
mark_inode_dirty(inode);
mark_buffer_dirty(bh);
if (IS_DIRSYNC(inode))
mark_inode_dirty(inode);
mark_buffer_dirty(bh);
if (IS_DIRSYNC(inode))