Commit 1fc5adbd authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert reiserfs 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a57c4d65

fs/reiserfs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, 
//

static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct cpu_key pos_key;	/* key of current position in the directory (key of directory entry) */

	INITIALIZE_PATH(path_to_entry);

	struct buffer_head *bh;
@@ -135,7 +135,7 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
				/* Ignore the .reiserfs_priv entry */

				if (reiserfs_xattrs(inode->i_sb) &&

				    !old_format_only(inode->i_sb) &&

				    filp->f_dentry == inode->i_sb->s_root &&

				    filp->f_path.dentry == inode->i_sb->s_root &&

				    REISERFS_SB(inode->i_sb)->priv_root &&

				    REISERFS_SB(inode->i_sb)->priv_root->d_inode

				    && deh_objectid(deh) ==

fs/reiserfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t 
	loff_t pos;		// Current position in the file.

	ssize_t res;		// return value of various functions that we call.

	int err = 0;

	struct inode *inode = file->f_dentry->d_inode;	// Inode of the file that we are writing to.

	struct inode *inode = file->f_path.dentry->d_inode;	// Inode of the file that we are writing to.

	/* To simplify coding at this time, we store

	   locked pages in array for now */

	struct page *prepared_pages[REISERFS_WRITE_PAGES_AT_A_TIME];
@@ -1335,7 +1335,7 @@ static ssize_t reiserfs_file_write(struct file *file, /* the file we are going t 
	if (count == 0)

		goto out;



	res = remove_suid(file->f_dentry);

	res = remove_suid(file->f_path.dentry);

	if (res)

		goto out;

fs/reiserfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int reiserfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, 
long reiserfs_compat_ioctl(struct file *file, unsigned int cmd,

				unsigned long arg)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int ret;



	/* These are just misnamed, they actually get/put from/to user an int */

fs/reiserfs/procfs.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int show_oidmap(struct seq_file *m, struct super_block *sb) 
	}

#if defined( REISERFS_USE_OIDMAPF )

	if (sb_info->oidmap.use_file && (sb_info->oidmap.mapf != NULL)) {

		loff_t size = sb_info->oidmap.mapf->f_dentry->d_inode->i_size;

		loff_t size = sb_info->oidmap.mapf->f_path.dentry->d_inode->i_size;

		total_used += size / sizeof(reiserfs_oidinterval_d_t);

	}

#endif

fs/reiserfs/xattr.c

+5 −5
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static struct file *open_xa_file(const struct inode *inode, const char *name, 
 */

static int __xattr_readdir(struct file *filp, void *dirent, filldir_t filldir)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct cpu_key pos_key;	/* key of current position in the directory (key of directory entry) */

	INITIALIZE_PATH(path_to_entry);

	struct buffer_head *bh;
@@ -420,7 +420,7 @@ static int __xattr_readdir(struct file *filp, void *dirent, filldir_t filldir) 
static

int xattr_readdir(struct file *file, filldir_t filler, void *buf)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	int res = -ENOTDIR;

	if (!file->f_op || !file->f_op->readdir)

		goto out;
@@ -508,7 +508,7 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, 
		goto out;

	}



	xinode = fp->f_dentry->d_inode;

	xinode = fp->f_path.dentry->d_inode;

	REISERFS_I(inode)->i_flags |= i_has_xattr_dir;



	/* we need to copy it off.. */
@@ -527,7 +527,7 @@ reiserfs_xattr_set(struct inode *inode, const char *name, const void *buffer, 
	newattrs.ia_size = buffer_size;

	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;

	mutex_lock(&xinode->i_mutex);

	err = notify_change(fp->f_dentry, &newattrs);

	err = notify_change(fp->f_path.dentry, &newattrs);

	if (err)

		goto out_filp;
@@ -626,7 +626,7 @@ reiserfs_xattr_get(const struct inode *inode, const char *name, void *buffer, 
		goto out;

	}



	xinode = fp->f_dentry->d_inode;

	xinode = fp->f_path.dentry->d_inode;

	isize = xinode->i_size;

	REISERFS_I(inode)->i_flags |= i_has_xattr_dir;