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

[PATCH] struct path: convert ocfs2 



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 6db5fc5d

fs/ocfs2/aops.c

+2 −2
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ static void ocfs2_dio_end_io(struct kiocb *iocb, 
			     ssize_t bytes,

			     void *private)

{

	struct inode *inode = iocb->ki_filp->f_dentry->d_inode;

	struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;



	/* this io's submitter should not have unlocked this before we could */

	BUG_ON(!ocfs2_iocb_is_rw_locked(iocb));
@@ -611,7 +611,7 @@ static ssize_t ocfs2_direct_IO(int rw, 
			       unsigned long nr_segs)

{

	struct file *file = iocb->ki_filp;

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

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

	int ret;



	mlog_entry_void();

fs/ocfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir) 
	struct buffer_head * bh, * tmp;

	struct ocfs2_dir_entry * de;

	int err;

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

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

	struct super_block * sb = inode->i_sb;

	unsigned int ra_sectors = 16;

	int lock_level = 0;

fs/ocfs2/dlm/dlmfs.c

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static ssize_t dlmfs_file_read(struct file *filp, 
	int bytes_left;

	ssize_t readlen;

	char *lvb_buf;

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

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



	mlog(0, "inode %lu, count = %zu, *ppos = %llu\n",

		inode->i_ino, count, *ppos);
@@ -220,7 +220,7 @@ static ssize_t dlmfs_file_write(struct file *filp, 
	int bytes_left;

	ssize_t writelen;

	char *lvb_buf;

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

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



	mlog(0, "inode %lu, count = %zu, *ppos = %llu\n",

		inode->i_ino, count, *ppos);

fs/ocfs2/file.c

+17 −17
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int ocfs2_file_open(struct inode *inode, struct file *file) 
	struct ocfs2_inode_info *oi = OCFS2_I(inode);



	mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,

		   file->f_dentry->d_name.len, file->f_dentry->d_name.name);

		   file->f_path.dentry->d_name.len, file->f_path.dentry->d_name.name);



	spin_lock(&oi->ip_lock);
@@ -98,8 +98,8 @@ static int ocfs2_file_release(struct inode *inode, struct file *file) 
	struct ocfs2_inode_info *oi = OCFS2_I(inode);



	mlog_entry("(0x%p, 0x%p, '%.*s')\n", inode, file,

		       file->f_dentry->d_name.len,

		       file->f_dentry->d_name.name);

		       file->f_path.dentry->d_name.len,

		       file->f_path.dentry->d_name.name);



	spin_lock(&oi->ip_lock);

	if (!--oi->ip_open_count)
@@ -1131,13 +1131,13 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, 
{

	int ret, rw_level, have_alloc_sem = 0;

	struct file *filp = iocb->ki_filp;

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

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

	int appending = filp->f_flags & O_APPEND ? 1 : 0;



	mlog_entry("(0x%p, %u, '%.*s')\n", filp,

		   (unsigned int)nr_segs,

		   filp->f_dentry->d_name.len,

		   filp->f_dentry->d_name.name);

		   filp->f_path.dentry->d_name.len,

		   filp->f_path.dentry->d_name.name);



	/* happy write of zero bytes */

	if (iocb->ki_left == 0)
@@ -1159,7 +1159,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, 
		goto out;

	}



	ret = ocfs2_prepare_inode_for_write(filp->f_dentry, &iocb->ki_pos,

	ret = ocfs2_prepare_inode_for_write(filp->f_path.dentry, &iocb->ki_pos,

					    iocb->ki_left, appending);

	if (ret < 0) {

		mlog_errno(ret);
@@ -1207,12 +1207,12 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe, 
				       unsigned int flags)

{

	int ret;

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

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



	mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", out, pipe,

		   (unsigned int)len,

		   out->f_dentry->d_name.len,

		   out->f_dentry->d_name.name);

		   out->f_path.dentry->d_name.len,

		   out->f_path.dentry->d_name.name);



	inode_double_lock(inode, pipe->inode);
@@ -1222,7 +1222,7 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe, 
		goto out;

	}



	ret = ocfs2_prepare_inode_for_write(out->f_dentry, ppos, len, 0);

	ret = ocfs2_prepare_inode_for_write(out->f_path.dentry, ppos, len, 0);

	if (ret < 0) {

		mlog_errno(ret);

		goto out_unlock;
@@ -1247,12 +1247,12 @@ static ssize_t ocfs2_file_splice_read(struct file *in, 
				      unsigned int flags)

{

	int ret = 0;

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

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



	mlog_entry("(0x%p, 0x%p, %u, '%.*s')\n", in, pipe,

		   (unsigned int)len,

		   in->f_dentry->d_name.len,

		   in->f_dentry->d_name.name);

		   in->f_path.dentry->d_name.len,

		   in->f_path.dentry->d_name.name);



	/*

	 * See the comment in ocfs2_file_aio_read()
@@ -1278,12 +1278,12 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, 
{

	int ret = 0, rw_level = -1, have_alloc_sem = 0, lock_level = 0;

	struct file *filp = iocb->ki_filp;

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

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



	mlog_entry("(0x%p, %u, '%.*s')\n", filp,

		   (unsigned int)nr_segs,

		   filp->f_dentry->d_name.len,

		   filp->f_dentry->d_name.name);

		   filp->f_path.dentry->d_name.len,

		   filp->f_path.dentry->d_name.name);



	if (!inode) {

		ret = -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE