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.5.x5
[linux-2.6.git]
/
fs
/
reiserfs
/
dir.c
diff --git
a/fs/reiserfs/dir.c
b/fs/reiserfs/dir.c
index
887fab3
..
d1514a9
100644
(file)
--- a/
fs/reiserfs/dir.c
+++ b/
fs/reiserfs/dir.c
@@
-12,10
+12,10
@@
#include <linux/buffer_head.h>
#include <asm/uaccess.h>
#include <linux/buffer_head.h>
#include <asm/uaccess.h>
-extern struct key MIN_KEY;
+extern struct
reiserfs_
key MIN_KEY;
static int reiserfs_readdir (struct file *, void *, filldir_t);
static int reiserfs_readdir (struct file *, void *, filldir_t);
-int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) ;
+
static
int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) ;
struct file_operations reiserfs_dir_operations = {
.read = generic_read_dir,
struct file_operations reiserfs_dir_operations = {
.read = generic_read_dir,
@@
-24,12
+24,15
@@
struct file_operations reiserfs_dir_operations = {
.ioctl = reiserfs_ioctl,
};
.ioctl = reiserfs_ioctl,
};
-int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) {
+
static
int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) {
struct inode *inode = dentry->d_inode;
struct inode *inode = dentry->d_inode;
+ int err;
reiserfs_write_lock(inode->i_sb);
reiserfs_write_lock(inode->i_sb);
- reiserfs_commit_for_inode(inode) ;
+
err =
reiserfs_commit_for_inode(inode) ;
reiserfs_write_unlock(inode->i_sb) ;
reiserfs_write_unlock(inode->i_sb) ;
- return 0 ;
+ if (err < 0)
+ return err;
+ return 0;
}
}
@@
-43,7
+46,7
@@
static int reiserfs_readdir (struct file * filp, void * dirent, filldir_t filldi
INITIALIZE_PATH (path_to_entry);
struct buffer_head * bh;
int item_num, entry_num;
INITIALIZE_PATH (path_to_entry);
struct buffer_head * bh;
int item_num, entry_num;
- const struct key * rkey;
+ const struct
reiserfs_
key * rkey;
struct item_head * ih, tmp_ih;
int search_res;
char * local_buf;
struct item_head * ih, tmp_ih;
int search_res;
char * local_buf;