Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd3758e3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Replace file->private_data with calls to nfs_file_open_context() 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c03025d5

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_ 
	for (fl = inode->i_flock; fl != 0; fl = fl->fl_next) {

		if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK)))

			continue;

		if ((struct nfs_open_context *)fl->fl_file->private_data != ctx)

		if (nfs_file_open_context(fl->fl_file) != ctx)

			continue;

		status = nfs4_lock_delegation_recall(state, fl);

		if (status >= 0)

fs/nfs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	memset(desc, 0, sizeof(*desc));



	desc->file = filp;

	desc->dir_cookie = &((struct nfs_open_context *)filp->private_data)->dir_cookie;

	desc->dir_cookie = &nfs_file_open_context(filp)->dir_cookie;

	desc->decode = NFS_PROTO(inode)->decode_dirent;

	desc->plus = NFS_USE_READDIRPLUS(inode);
@@ -623,7 +623,7 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin) 
	}

	if (offset != filp->f_pos) {

		filp->f_pos = offset;

		((struct nfs_open_context *)filp->private_data)->dir_cookie = 0;

		nfs_file_open_context(filp)->dir_cookie = 0;

	}

out:

	mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex);

fs/nfs/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static ssize_t nfs_direct_read(struct kiocb *iocb, unsigned long user_addr, size 
		return -ENOMEM;



	dreq->inode = inode;

	dreq->ctx = get_nfs_open_context((struct nfs_open_context *)iocb->ki_filp->private_data);

	dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));

	if (!is_sync_kiocb(iocb))

		dreq->iocb = iocb;
@@ -718,7 +718,7 @@ static ssize_t nfs_direct_write(struct kiocb *iocb, unsigned long user_addr, siz 
		sync = FLUSH_STABLE;



	dreq->inode = inode;

	dreq->ctx = get_nfs_open_context((struct nfs_open_context *)iocb->ki_filp->private_data);

	dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));

	if (!is_sync_kiocb(iocb))

		dreq->iocb = iocb;

fs/nfs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int nfs_do_fsync(struct nfs_open_context *ctx, struct inode *inode) 
static int

nfs_file_flush(struct file *file, fl_owner_t id)

{

	struct nfs_open_context *ctx = (struct nfs_open_context *)file->private_data;

	struct nfs_open_context *ctx = nfs_file_open_context(file);

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

	int		status;
@@ -296,7 +296,7 @@ nfs_file_mmap(struct file * file, struct vm_area_struct * vma) 
static int

nfs_fsync(struct file *file, struct dentry *dentry, int datasync)

{

	struct nfs_open_context *ctx = (struct nfs_open_context *)file->private_data;

	struct nfs_open_context *ctx = nfs_file_open_context(file);

	struct inode *inode = dentry->d_inode;



	dfprintk(VFS, "nfs: fsync(%s/%ld)\n", inode->i_sb->s_id, inode->i_ino);
@@ -395,7 +395,7 @@ static int nfs_need_sync_write(struct file *filp, struct inode *inode) 


	if (IS_SYNC(inode) || (filp->f_flags & O_SYNC))

		return 1;

	ctx = filp->private_data;

	ctx = nfs_file_open_context(filp);

	if (test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags))

		return 1;

	return 0;
@@ -438,7 +438,7 @@ static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, 
	result = generic_file_aio_write(iocb, iov, nr_segs, pos);

	/* Return error values for O_SYNC and IS_SYNC() */

	if (result >= 0 && nfs_need_sync_write(iocb->ki_filp, inode)) {

		int err = nfs_do_fsync(iocb->ki_filp->private_data, inode);

		int err = nfs_do_fsync(nfs_file_open_context(iocb->ki_filp), inode);

		if (err < 0)

			result = err;

	}

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ struct nfs_open_context *nfs_find_open_context(struct inode *inode, struct rpc_c 
static void nfs_file_clear_open_context(struct file *filp)

{

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

	struct nfs_open_context *ctx = (struct nfs_open_context *)filp->private_data;

	struct nfs_open_context *ctx = nfs_file_open_context(filp);



	if (ctx) {

		filp->private_data = NULL;