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

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

NFS: Make nfs_open methods consistent 



Clean up: Report the same debugging info and count function calls the
same for files and directories in nfs_opendir() and nfs_file_open().

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

fs/nfs/dir.c

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

	int res;



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

			inode->i_sb->s_id, inode->i_ino);

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

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

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



	nfs_inc_stats(inode, NFSIOS_VFSOPEN);



	lock_kernel();

	/* Call generic open code in order to cache credentials */

fs/nfs/file.c

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ nfs_file_open(struct inode *inode, struct file *filp) 
{

	int res;



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

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

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



	res = nfs_check_flags(filp->f_flags);

	if (res)

		return res;