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

Commit 1e8968c5 authored by Niels de Vos's avatar Niels de Vos Committed by Trond Myklebust
Browse files

NFS: dprintk() should not print negative fileids and inode numbers 



A fileid in NFS is a uint64. There are some occurrences where dprintk()
outputs a signed fileid. This leads to confusion and more difficult to
read debugging (negative fileids matching positive inode numbers).

Signed-off-by: default avatarNiels de Vos <ndevos@redhat.com>
CC: Santosh Pradhan <spradhan@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent a8c22754

fs/nfs/dir.c

+9 −9
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry, 
	/* Expect a negative dentry */

	BUG_ON(dentry->d_inode);



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

	dfprintk(VFS, "NFS: atomic_open(%s/%lu), %pd\n",

			dir->i_sb->s_id, dir->i_ino, dentry);



	err = nfs_check_flags(open_flags);
@@ -1594,7 +1594,7 @@ int nfs_create(struct inode *dir, struct dentry *dentry, 
	int open_flags = excl ? O_CREAT | O_EXCL : O_CREAT;

	int error;



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

	dfprintk(VFS, "NFS: create(%s/%lu), %pd\n",

			dir->i_sb->s_id, dir->i_ino, dentry);



	attr.ia_mode = mode;
@@ -1621,7 +1621,7 @@ nfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev) 
	struct iattr attr;

	int status;



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

	dfprintk(VFS, "NFS: mknod(%s/%lu), %pd\n",

			dir->i_sb->s_id, dir->i_ino, dentry);



	if (!new_valid_dev(rdev))
@@ -1650,7 +1650,7 @@ int nfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
	struct iattr attr;

	int error;



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

	dfprintk(VFS, "NFS: mkdir(%s/%lu), %pd\n",

			dir->i_sb->s_id, dir->i_ino, dentry);



	attr.ia_valid = ATTR_MODE;
@@ -1678,7 +1678,7 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry) 
{

	int error;



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

	dfprintk(VFS, "NFS: rmdir(%s/%lu), %pd\n",

			dir->i_sb->s_id, dir->i_ino, dentry);



	trace_nfs_rmdir_enter(dir, dentry);
@@ -1747,7 +1747,7 @@ int nfs_unlink(struct inode *dir, struct dentry *dentry) 
	int error;

	int need_rehash = 0;



	dfprintk(VFS, "NFS: unlink(%s/%ld, %pd)\n", dir->i_sb->s_id,

	dfprintk(VFS, "NFS: unlink(%s/%lu, %pd)\n", dir->i_sb->s_id,

		dir->i_ino, dentry);



	trace_nfs_unlink_enter(dir, dentry);
@@ -1798,7 +1798,7 @@ int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) 
	unsigned int pathlen = strlen(symname);

	int error;



	dfprintk(VFS, "NFS: symlink(%s/%ld, %pd, %s)\n", dir->i_sb->s_id,

	dfprintk(VFS, "NFS: symlink(%s/%lu, %pd, %s)\n", dir->i_sb->s_id,

		dir->i_ino, dentry, symname);



	if (pathlen > PAGE_SIZE)
@@ -1821,7 +1821,7 @@ int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *symname) 
	error = NFS_PROTO(dir)->symlink(dir, dentry, page, pathlen, &attr);

	trace_nfs_symlink_exit(dir, dentry, error);

	if (error != 0) {

		dfprintk(VFS, "NFS: symlink(%s/%ld, %pd, %s) error %d\n",

		dfprintk(VFS, "NFS: symlink(%s/%lu, %pd, %s) error %d\n",

			dir->i_sb->s_id, dir->i_ino,

			dentry, symname, error);

		d_drop(dentry);
@@ -2304,7 +2304,7 @@ int nfs_permission(struct inode *inode, int mask) 
	if (!res && (mask & MAY_EXEC) && !execute_ok(inode))

		res = -EACCES;



	dfprintk(VFS, "NFS: permission(%s/%ld), mask=0x%x, res=%d\n",

	dfprintk(VFS, "NFS: permission(%s/%lu), mask=0x%x, res=%d\n",

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

	return res;

out_notsup:

fs/nfs/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -237,9 +237,9 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) 


static void nfs_direct_readpage_release(struct nfs_page *req)

{

	dprintk("NFS: direct read done (%s/%lld %d@%lld)\n",

	dprintk("NFS: direct read done (%s/%llu %d@%lld)\n",

		req->wb_context->dentry->d_inode->i_sb->s_id,

		(long long)NFS_FILEID(req->wb_context->dentry->d_inode),

		(unsigned long long)NFS_FILEID(req->wb_context->dentry->d_inode),

		req->wb_bytes,

		(long long)req_offset(req));

	nfs_release_request(req);

fs/nfs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping, 
	struct page *page;

	int once_thru = 0;



	dfprintk(PAGECACHE, "NFS: write_begin(%pD2(%ld), %u@%lld)\n",

	dfprintk(PAGECACHE, "NFS: write_begin(%pD2(%lu), %u@%lld)\n",

		file, mapping->host->i_ino, len, (long long) pos);



start:
@@ -395,7 +395,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, 
	struct nfs_open_context *ctx = nfs_file_open_context(file);

	int status;



	dfprintk(PAGECACHE, "NFS: write_end(%pD2(%ld), %u@%lld)\n",

	dfprintk(PAGECACHE, "NFS: write_end(%pD2(%lu), %u@%lld)\n",

		file, mapping->host->i_ino, len, (long long) pos);



	/*
@@ -585,7 +585,7 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
	int ret = VM_FAULT_NOPAGE;

	struct address_space *mapping;



	dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%ld), offset %lld)\n",

	dfprintk(PAGECACHE, "NFS: vm_page_mkwrite(%pD2(%lu), offset %lld)\n",

		filp, filp->f_mapping->host->i_ino,

		(long long)page_offset(page));

fs/nfs/inode.c

+15 −14
Original line number Diff line number Diff line
@@ -458,9 +458,9 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st 
		unlock_new_inode(inode);

	} else

		nfs_refresh_inode(inode, fattr);

	dprintk("NFS: nfs_fhget(%s/%Ld fh_crc=0x%08x ct=%d)\n",

	dprintk("NFS: nfs_fhget(%s/%Lu fh_crc=0x%08x ct=%d)\n",

		inode->i_sb->s_id,

		(long long)NFS_FILEID(inode),

		(unsigned long long)NFS_FILEID(inode),

		nfs_display_fhandle_hash(fh),

		atomic_read(&inode->i_count));
@@ -870,8 +870,8 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 
	struct nfs_fattr *fattr = NULL;

	struct nfs_inode *nfsi = NFS_I(inode);



	dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n",

		inode->i_sb->s_id, (long long)NFS_FILEID(inode));

	dfprintk(PAGECACHE, "NFS: revalidating (%s/%Lu)\n",

		inode->i_sb->s_id, (unsigned long long)NFS_FILEID(inode));



	trace_nfs_revalidate_inode_enter(inode);
@@ -895,9 +895,9 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 


	status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr, label);

	if (status != 0) {

		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n",

		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Lu) getattr failed, error=%d\n",

			 inode->i_sb->s_id,

			 (long long)NFS_FILEID(inode), status);

			 (unsigned long long)NFS_FILEID(inode), status);

		if (status == -ESTALE) {

			nfs_zap_caches(inode);

			if (!S_ISDIR(inode->i_mode))
@@ -908,9 +908,9 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 


	status = nfs_refresh_inode(inode, fattr);

	if (status) {

		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n",

		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Lu) refresh failed, error=%d\n",

			 inode->i_sb->s_id,

			 (long long)NFS_FILEID(inode), status);

			 (unsigned long long)NFS_FILEID(inode), status);

		goto err_out;

	}
@@ -919,9 +919,9 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 


	nfs_setsecurity(inode, fattr, label);



	dfprintk(PAGECACHE, "NFS: (%s/%Ld) revalidation complete\n",

	dfprintk(PAGECACHE, "NFS: (%s/%Lu) revalidation complete\n",

		inode->i_sb->s_id,

		(long long)NFS_FILEID(inode));

		(unsigned long long)NFS_FILEID(inode));



err_out:

	nfs4_label_free(label);
@@ -985,8 +985,9 @@ static int nfs_invalidate_mapping(struct inode *inode, struct address_space *map 
	nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);

	nfs_fscache_wait_on_invalidate(inode);



	dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",

			inode->i_sb->s_id, (long long)NFS_FILEID(inode));

	dfprintk(PAGECACHE, "NFS: (%s/%Lu) data cache invalidated\n",

			inode->i_sb->s_id,

			(unsigned long long)NFS_FILEID(inode));

	return 0;

}
@@ -1434,7 +1435,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	unsigned long now = jiffies;

	unsigned long save_cache_validity;



	dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n",

	dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n",

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

			nfs_display_fhandle_hash(NFS_FH(inode)),

			atomic_read(&inode->i_count), fattr->valid);
@@ -1455,7 +1456,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
		/*

		* Big trouble! The inode has become a different object.

		*/

		printk(KERN_DEBUG "NFS: %s: inode %ld mode changed, %07o to %07o\n",

		printk(KERN_DEBUG "NFS: %s: inode %lu mode changed, %07o to %07o\n",

				__func__, inode->i_ino, inode->i_mode, fattr->mode);

		goto out_err;

	}

fs/nfs/nfs3acl.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void __nfs3_forget_cached_acls(struct nfs_inode *nfsi) 


void nfs3_forget_cached_acls(struct inode *inode)

{

	dprintk("NFS: nfs3_forget_cached_acls(%s/%ld)\n", inode->i_sb->s_id,

	dprintk("NFS: nfs3_forget_cached_acls(%s/%lu)\n", inode->i_sb->s_id,

		inode->i_ino);

	spin_lock(&inode->i_lock);

	__nfs3_forget_cached_acls(NFS_I(inode));
@@ -161,7 +161,7 @@ static struct posix_acl *nfs3_get_cached_acl(struct inode *inode, int type) 
		acl = posix_acl_dup(acl);

out:

	spin_unlock(&inode->i_lock);

	dprintk("NFS: nfs3_get_cached_acl(%s/%ld, %d) = %p\n", inode->i_sb->s_id,

	dprintk("NFS: nfs3_get_cached_acl(%s/%lu, %d) = %p\n", inode->i_sb->s_id,

		inode->i_ino, type, acl);

	return acl;

}