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
/
reiserfs
/
file.c
diff --git
a/fs/reiserfs/file.c
b/fs/reiserfs/file.c
index
4127ad1
..
0eea8b4
100644
(file)
--- a/
fs/reiserfs/file.c
+++ b/
fs/reiserfs/file.c
@@
-48,8
+48,8
@@
static int reiserfs_file_release(struct inode *inode, struct file *filp)
return 0;
}
return 0;
}
- mutex_lock(&inode->i_mutex);
reiserfs_write_lock(inode->i_sb);
reiserfs_write_lock(inode->i_sb);
+ mutex_lock(&inode->i_mutex);
/* freeing preallocation only involves relogging blocks that
* are already in the current transaction. preallocation gets
* freed at the end of each transaction, so it is impossible for
/* freeing preallocation only involves relogging blocks that
* are already in the current transaction. preallocation gets
* freed at the end of each transaction, so it is impossible for
@@
-860,12
+860,8
@@
static int reiserfs_submit_file_region_for_write(struct reiserfs_transaction_han
// this sets the proper flags for O_SYNC to trigger a commit
mark_inode_dirty(inode);
reiserfs_write_unlock(inode->i_sb);
// this sets the proper flags for O_SYNC to trigger a commit
mark_inode_dirty(inode);
reiserfs_write_unlock(inode->i_sb);
- } else {
- reiserfs_write_lock(inode->i_sb);
- reiserfs_update_inode_transaction(inode);
+ } else
mark_inode_dirty(inode);
mark_inode_dirty(inode);
- reiserfs_write_unlock(inode->i_sb);
- }
sd_update = 1;
}
sd_update = 1;
}
@@
-1564,6
+1560,12
@@
static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t
return res;
}
return res;
}
+static ssize_t reiserfs_aio_write(struct kiocb *iocb, const char __user * buf,
+ size_t count, loff_t pos)
+{
+ return generic_file_aio_write(iocb, buf, count, pos);
+}
+
const struct file_operations reiserfs_file_operations = {
.read = generic_file_read,
.write = reiserfs_file_write,
const struct file_operations reiserfs_file_operations = {
.read = generic_file_read,
.write = reiserfs_file_write,
@@
-1573,7
+1575,7
@@
const struct file_operations reiserfs_file_operations = {
.fsync = reiserfs_sync_file,
.sendfile = generic_file_sendfile,
.aio_read = generic_file_aio_read,
.fsync = reiserfs_sync_file,
.sendfile = generic_file_sendfile,
.aio_read = generic_file_aio_read,
- .aio_write =
generic_file
_aio_write,
+ .aio_write =
reiserfs
_aio_write,
.splice_read = generic_file_splice_read,
.splice_write = generic_file_splice_write,
};
.splice_read = generic_file_splice_read,
.splice_write = generic_file_splice_write,
};