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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
ufs
/
dir.c
diff --git
a/fs/ufs/dir.c
b/fs/ufs/dir.c
index
3d6a263
..
1a56120
100644
(file)
--- a/
fs/ufs/dir.c
+++ b/
fs/ufs/dir.c
@@
-462,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);
@@
-491,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) {
@@
-505,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))
@@
-620,7
+620,7
@@
int ufs_empty_dir (struct inode * inode)
return 1;
}
return 1;
}
-struct file_operations ufs_dir_operations = {
+
const
struct file_operations ufs_dir_operations = {
.read = generic_read_dir,
.readdir = ufs_readdir,
.fsync = file_fsync,
.read = generic_read_dir,
.readdir = ufs_readdir,
.fsync = file_fsync,