Commit 205f92d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.d_name' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull d_name whack-a-mole from Al Viro:
 "A bunch of places that play with ->d_name in printks instead of using
  proper formats..."

* 'work.d_name' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  orangefs_file_mmap(): use %pD
  cifs_debug: use %pd instead of messing with ->d_name
  erofs: use %pd instead of messing with ->d_name
  cramfs: use %pD instead of messing with file_dentry()->d_name
parents 7b7028ed d6756841

fs/cifs/cifs_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -197,14 +197,14 @@ static int cifs_debug_files_proc_show(struct seq_file *m, void *v) 
					cfile = list_entry(tmp2, struct cifsFileInfo,

						     tlist);

					seq_printf(m,

						"0x%x 0x%llx 0x%x %d %d %d %s",

						"0x%x 0x%llx 0x%x %d %d %d %pd",

						tcon->tid,

						cfile->fid.persistent_fid,

						cfile->f_flags,

						cfile->count,

						cfile->pid,

						from_kuid(&init_user_ns, cfile->uid),

						cfile->dentry->d_name.name);

						cfile->dentry);

#ifdef CONFIG_CIFS_DEBUG2

					seq_printf(m, " 0x%llx\n", cfile->fid.mid);

#else

fs/cramfs/inode.c

+8 −10
Original line number Diff line number Diff line
@@ -392,8 +392,7 @@ static int cramfs_physmem_mmap(struct file *file, struct vm_area_struct *vma) 


	/* Don't map the last page if it contains some other data */

	if (pgoff + pages == max_pages && cramfs_last_page_is_shared(inode)) {

		pr_debug("mmap: %s: last page is shared\n",

			 file_dentry(file)->d_name.name);

		pr_debug("mmap: %pD: last page is shared\n", file);

		pages--;

	}
@@ -430,16 +429,15 @@ static int cramfs_physmem_mmap(struct file *file, struct vm_area_struct *vma) 
	}



	if (!ret)

		pr_debug("mapped %s[%lu] at 0x%08lx (%u/%lu pages) "

			 "to vma 0x%08lx, page_prot 0x%llx\n",

			 file_dentry(file)->d_name.name, pgoff,

			 address, pages, vma_pages(vma), vma->vm_start,

		pr_debug("mapped %pD[%lu] at 0x%08lx (%u/%lu pages) "

			 "to vma 0x%08lx, page_prot 0x%llx\n", file,

			 pgoff, address, pages, vma_pages(vma), vma->vm_start,

			 (unsigned long long)pgprot_val(vma->vm_page_prot));

	return ret;



bailout:

	pr_debug("%s[%lu]: direct mmap impossible: %s\n",

		 file_dentry(file)->d_name.name, pgoff, bailout_reason);

	pr_debug("%pD[%lu]: direct mmap impossible: %s\n",

		 file, pgoff, bailout_reason);

	/* Didn't manage any direct map, but normal paging is still possible */

	return 0;

}
@@ -469,8 +467,8 @@ static unsigned long cramfs_physmem_get_unmapped_area(struct file *file, 
	if (!offset || block_pages != pages)

		return -ENOSYS;

	addr = sbi->linear_phys_addr + offset;

	pr_debug("get_unmapped for %s ofs %#lx siz %lu at 0x%08lx\n",

		 file_dentry(file)->d_name.name, pgoff*PAGE_SIZE, len, addr);

	pr_debug("get_unmapped for %pD ofs %#lx siz %lu at 0x%08lx\n",

		 file, pgoff*PAGE_SIZE, len, addr);

	return addr;

}

fs/erofs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ static struct dentry *erofs_lookup(struct inode *dir, 
	} else if (err) {

		inode = ERR_PTR(err);

	} else {

		erofs_dbg("%s, %s (nid %llu) found, d_type %u", __func__,

			  dentry->d_name.name, nid, d_type);

		erofs_dbg("%s, %pd (nid %llu) found, d_type %u", __func__,

			  dentry, nid, d_type);

		inode = erofs_iget(dir->i_sb, nid, d_type == FT_DIR);

	}

	return d_splice_alias(inode, dentry);

fs/orangefs/file.c

+1 −4
Original line number Diff line number Diff line
@@ -487,10 +487,7 @@ static int orangefs_file_mmap(struct file *file, struct vm_area_struct *vma) 
		return ret;



	gossip_debug(GOSSIP_FILE_DEBUG,

		     "orangefs_file_mmap: called on %s\n",

		     (file ?

			(char *)file->f_path.dentry->d_name.name :

			(char *)"Unknown"));

		     "orangefs_file_mmap: called on %pD\n", file);



	/* set the sequential readahead hint */

	vma->vm_flags |= VM_SEQ_READ;