nfsd: convert nfs4_file->fi_fds array to use nfsd_files (fd4f83fd) · Commits · 戴 / test

fs/nfsd/nfs4state.c

+18 −17

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@

		#include "netns.h"
		#include "pnfs.h"
		#include "filecache.h"

		#define NFSDDBG_FACILITY NFSDDBG_PROC

		@@ -433,7 +434,7 @@ static struct file *
		__nfs4_get_fd(struct nfs4_file *f, int oflag)
		{
		if (f->fi_fds[oflag])
		return get_file(f->fi_fds[oflag]);
		return get_file(f->fi_fds[oflag]->nf_file);
		return NULL;
		}

		@@ -590,17 +591,17 @@ static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag)
		might_lock(&fp->fi_lock);

		if (atomic_dec_and_lock(&fp->fi_access[oflag], &fp->fi_lock)) {
		struct file *f1 = NULL;
		struct file *f2 = NULL;
		struct nfsd_file *f1 = NULL;
		struct nfsd_file *f2 = NULL;

		swap(f1, fp->fi_fds[oflag]);
		if (atomic_read(&fp->fi_access[1 - oflag]) == 0)
		swap(f2, fp->fi_fds[O_RDWR]);
		spin_unlock(&fp->fi_lock);
		if (f1)
		fput(f1);
		nfsd_file_put(f1);
		if (f2)
		fput(f2);
		nfsd_file_put(f2);
		}
		}

		@@ -2323,9 +2324,9 @@ static void states_stop(struct seq_file s, void v)
		spin_unlock(&clp->cl_lock);
		}

		static void nfs4_show_superblock(struct seq_file s, struct file f)
		static void nfs4_show_superblock(struct seq_file s, struct nfsd_file f)
		{
		struct inode *inode = file_inode(f);
		struct inode *inode = f->nf_inode;

		seq_printf(s, "superblock: \"%02x:%02x:%ld\"",
		MAJOR(inode->i_sb->s_dev),
		@@ -2343,7 +2344,7 @@ static int nfs4_show_open(struct seq_file s, struct nfs4_stid st)
		{
		struct nfs4_ol_stateid *ols;
		struct nfs4_file *nf;
		struct file *file;
		struct nfsd_file *file;
		struct nfs4_stateowner *oo;
		unsigned int access, deny;

		@@ -2370,7 +2371,7 @@ static int nfs4_show_open(struct seq_file s, struct nfs4_stid st)
		seq_printf(s, ", ");
		nfs4_show_owner(s, oo);
		seq_printf(s, " }\n");
		fput(file);
		nfsd_file_put(file);

		return 0;
		}
		@@ -2379,7 +2380,7 @@ static int nfs4_show_lock(struct seq_file s, struct nfs4_stid st)
		{
		struct nfs4_ol_stateid *ols;
		struct nfs4_file *nf;
		struct file *file;
		struct nfsd_file *file;
		struct nfs4_stateowner *oo;

		ols = openlockstateid(st);
		@@ -2401,7 +2402,7 @@ static int nfs4_show_lock(struct seq_file s, struct nfs4_stid st)
		seq_printf(s, ", ");
		nfs4_show_owner(s, oo);
		seq_printf(s, " }\n");
		fput(file);
		nfsd_file_put(file);

		return 0;
		}
		@@ -4651,7 +4652,7 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst rqstp, struct nfs4_file fp,
		struct svc_fh cur_fh, struct nfs4_ol_stateid stp,
		struct nfsd4_open *open)
		{
		struct file *filp = NULL;
		struct nfsd_file *nf = NULL;
		__be32 status;
		int oflag = nfs4_access_to_omode(open->op_share_access);
		int access = nfs4_access_to_access(open->op_share_access);
		@@ -4687,18 +4688,18 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst rqstp, struct nfs4_file fp,

		if (!fp->fi_fds[oflag]) {
		spin_unlock(&fp->fi_lock);
		status = nfsd_open(rqstp, cur_fh, S_IFREG, access, &filp);
		status = nfsd_file_acquire(rqstp, cur_fh, access, &nf);
		if (status)
		goto out_put_access;
		spin_lock(&fp->fi_lock);
		if (!fp->fi_fds[oflag]) {
		fp->fi_fds[oflag] = filp;
		filp = NULL;
		fp->fi_fds[oflag] = nf;
		nf = NULL;
		}
		}
		spin_unlock(&fp->fi_lock);
		if (filp)
		fput(filp);
		if (nf)
		nfsd_file_put(nf);

		status = nfsd4_truncate(rqstp, cur_fh, open);
		if (status)

fs/nfsd/state.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -506,7 +506,7 @@ struct nfs4_file {
		};
		struct list_head fi_clnt_odstate;
		/* One each for O_RDONLY, O_WRONLY, O_RDWR: */
		struct file * fi_fds[3];
		struct nfsd_file *fi_fds[3];
		/*
		* Each open or lock stateid contributes 0-4 to the counts
		* below depending on which bits are set in st_access_bitmap:

Admin message