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

Commit 6da24bc9 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Use NFSDBG_FILE for all fops 



Clean up: some fops use NFSDBG_FILE, some use NFSDBG_VFS.  Let's use
NFSDBG_FILE for all fops, and consistently report file names instead
of inode numbers.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b7eaefaa

fs/nfs/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ nfs_opendir(struct inode *inode, struct file *filp) 
{

	int res;



	dfprintk(VFS, "NFS: open dir(%s/%s)\n",

	dfprintk(FILE, "NFS: open dir(%s/%s)\n",

			filp->f_path.dentry->d_parent->d_name.name,

			filp->f_path.dentry->d_name.name);
@@ -531,7 +531,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	struct nfs_fattr fattr;

	long		res;



	dfprintk(VFS, "NFS: readdir(%s/%s) starting at cookie %Lu\n",

	dfprintk(FILE, "NFS: readdir(%s/%s) starting at cookie %llu\n",

			dentry->d_parent->d_name.name, dentry->d_name.name,

			(long long)filp->f_pos);

	nfs_inc_stats(inode, NFSIOS_VFSGETDENTS);
@@ -598,7 +598,7 @@ static int nfs_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	unlock_kernel();

	if (res > 0)

		res = 0;

	dfprintk(VFS, "NFS: readdir(%s/%s) returns %ld\n",

	dfprintk(FILE, "NFS: readdir(%s/%s) returns %ld\n",

			dentry->d_parent->d_name.name, dentry->d_name.name,

			res);

	return res;
@@ -609,7 +609,7 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin) 
	struct dentry *dentry = filp->f_path.dentry;

	struct inode *inode = dentry->d_inode;



	dfprintk(VFS, "NFS: llseek dir(%s/%s, %lld, %d)\n",

	dfprintk(FILE, "NFS: llseek dir(%s/%s, %lld, %d)\n",

			dentry->d_parent->d_name.name,

			dentry->d_name.name,

			offset, origin);
@@ -640,7 +640,7 @@ static loff_t nfs_llseek_dir(struct file *filp, loff_t offset, int origin) 
 */

static int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)

{

	dfprintk(VFS, "NFS: fsync dir(%s/%s) datasync %d\n",

	dfprintk(FILE, "NFS: fsync dir(%s/%s) datasync %d\n",

			dentry->d_parent->d_name.name, dentry->d_name.name,

			datasync);

fs/nfs/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov, 
	count = iov_length(iov, nr_segs);

	nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count);



	dprintk("nfs: direct read(%s/%s, %zd@%Ld)\n",

	dfprintk(FILE, "NFS: direct read(%s/%s, %zd@%Ld)\n",

		file->f_path.dentry->d_parent->d_name.name,

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

		count, (long long) pos);
@@ -947,7 +947,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, 
	count = iov_length(iov, nr_segs);

	nfs_add_stats(mapping->host, NFSIOS_DIRECTWRITTENBYTES, count);



	dfprintk(VFS, "nfs: direct write(%s/%s, %zd@%Ld)\n",

	dfprintk(FILE, "NFS: direct write(%s/%s, %zd@%Ld)\n",

		file->f_path.dentry->d_parent->d_name.name,

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

		count, (long long) pos);

fs/nfs/file.c

+36 −23
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ nfs_file_open(struct inode *inode, struct file *filp) 
{

	int res;



	dfprintk(VFS, "NFS: open file(%s/%s)\n",

	dprintk("NFS: open file(%s/%s)\n",

			filp->f_path.dentry->d_parent->d_name.name,

			filp->f_path.dentry->d_name.name);
@@ -137,9 +137,15 @@ nfs_file_open(struct inode *inode, struct file *filp) 
static int

nfs_file_release(struct inode *inode, struct file *filp)

{

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



	dprintk("NFS: release(%s/%s)\n",

			dentry->d_parent->d_name.name,

			dentry->d_name.name);



	/* Ensure that dirty pages are flushed out with the right creds */

	if (filp->f_mode & FMODE_WRITE)

		nfs_wb_all(filp->f_path.dentry->d_inode);

		nfs_wb_all(dentry->d_inode);

	nfs_inc_stats(inode, NFSIOS_VFSRELEASE);

	return NFS_PROTO(inode)->file_release(inode, filp);

}
@@ -174,7 +180,7 @@ static int nfs_revalidate_file_size(struct inode *inode, struct file *filp) 


static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)

{

	dfprintk(VFS, "NFS: llseek file(%s/%s, %lld, %d)\n",

	dprintk("NFS: llseek file(%s/%s, %lld, %d)\n",

			filp->f_path.dentry->d_parent->d_name.name,

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

			offset, origin);
@@ -216,16 +222,18 @@ static int nfs_do_fsync(struct nfs_open_context *ctx, struct inode *inode) 


/*

 * Flush all dirty pages, and check for write errors.

 *

 */

static int

nfs_file_flush(struct file *file, fl_owner_t id)

{

	struct nfs_open_context *ctx = nfs_file_open_context(file);

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

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

	struct inode	*inode = dentry->d_inode;

	int		status;



	dfprintk(VFS, "nfs: flush(%s/%ld)\n", inode->i_sb->s_id, inode->i_ino);

	dprintk("NFS: flush(%s/%s)\n",

			dentry->d_parent->d_name.name,

			dentry->d_name.name);



	if ((file->f_mode & FMODE_WRITE) == 0)

		return 0;
@@ -250,7 +258,7 @@ nfs_file_read(struct kiocb *iocb, const struct iovec *iov, 
	if (iocb->ki_filp->f_flags & O_DIRECT)

		return nfs_file_direct_read(iocb, iov, nr_segs, pos);



	dfprintk(VFS, "nfs: read(%s/%s, %lu@%lu)\n",

	dprintk("NFS: read(%s/%s, %lu@%lu)\n",

		dentry->d_parent->d_name.name, dentry->d_name.name,

		(unsigned long) count, (unsigned long) pos);
@@ -270,7 +278,7 @@ nfs_file_splice_read(struct file *filp, loff_t *ppos, 
	struct inode *inode = dentry->d_inode;

	ssize_t res;



	dfprintk(VFS, "nfs: splice_read(%s/%s, %lu@%Lu)\n",

	dprintk("NFS: splice_read(%s/%s, %lu@%Lu)\n",

		dentry->d_parent->d_name.name, dentry->d_name.name,

		(unsigned long) count, (unsigned long long) *ppos);
@@ -287,7 +295,7 @@ nfs_file_mmap(struct file * file, struct vm_area_struct * vma) 
	struct inode *inode = dentry->d_inode;

	int	status;



	dfprintk(VFS, "nfs: mmap(%s/%s)\n",

	dprintk("NFS: mmap(%s/%s)\n",

		dentry->d_parent->d_name.name, dentry->d_name.name);



	status = nfs_revalidate_mapping(inode, file->f_mapping);
@@ -310,7 +318,7 @@ nfs_file_fsync(struct file *file, struct dentry *dentry, int datasync) 
	struct nfs_open_context *ctx = nfs_file_open_context(file);

	struct inode *inode = dentry->d_inode;



	dfprintk(VFS, "NFS: fsync file(%s/%s) datasync %d\n",

	dprintk("NFS: fsync file(%s/%s) datasync %d\n",

			dentry->d_parent->d_name.name, dentry->d_name.name,

			datasync);
@@ -502,9 +510,9 @@ static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, 
	if (iocb->ki_filp->f_flags & O_DIRECT)

		return nfs_file_direct_write(iocb, iov, nr_segs, pos);



	dfprintk(VFS, "nfs: write(%s/%s(%ld), %lu@%Ld)\n",

	dprintk("NFS: write(%s/%s, %lu@%Ld)\n",

		dentry->d_parent->d_name.name, dentry->d_name.name,

		inode->i_ino, (unsigned long) count, (long long) pos);

		(unsigned long) count, (long long) pos);



	result = -EBUSY;

	if (IS_SWAPFILE(inode))
@@ -652,10 +660,12 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) 
	struct inode *inode = filp->f_mapping->host;

	int ret = -ENOLCK;



	dprintk("NFS: nfs_lock(f=%s/%ld, t=%x, fl=%x, r=%Ld:%Ld)\n",

			inode->i_sb->s_id, inode->i_ino,

	dprintk("NFS: lock(%s/%s, t=%x, fl=%x, r=%lld:%lld)\n",

			filp->f_path.dentry->d_parent->d_name.name,

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

			fl->fl_type, fl->fl_flags,

			(long long)fl->fl_start, (long long)fl->fl_end);



	nfs_inc_stats(inode, NFSIOS_VFSLOCK);



	/* No mandatory locks over NFS */
@@ -683,9 +693,9 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl) 
 */

static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl)

{

	dprintk("NFS: nfs_flock(f=%s/%ld, t=%x, fl=%x)\n",

			filp->f_path.dentry->d_inode->i_sb->s_id,

			filp->f_path.dentry->d_inode->i_ino,

	dprintk("NFS: flock(%s/%s, t=%x, fl=%x)\n",

			filp->f_path.dentry->d_parent->d_name.name,

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

			fl->fl_type, fl->fl_flags);



	/*
@@ -708,12 +718,15 @@ static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl) 
	return do_setlk(filp, cmd, fl);

}



static int nfs_setlease(struct file *file, long arg, struct file_lock **fl)

{

/*

	 * There is no protocol support for leases, so we have no way

	 * to implement them correctly in the face of opens by other

	 * clients.

 * There is no protocol support for leases, so we have no way to implement

 * them correctly in the face of opens by other clients.

 */

static int nfs_setlease(struct file *file, long arg, struct file_lock **fl)

{

	dprintk("NFS: setlease(%s/%s, arg=%ld)\n",

			file->f_path.dentry->d_parent->d_name.name,

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



	return -EINVAL;

}