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

Commit a455589f authored by Al Viro's avatar Al Viro
Browse files

assorted conversions to %p[dD] 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 41d28bca

arch/powerpc/oprofile/cell/spu_task_sync.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -331,8 +331,7 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp, 




	if (mm->exe_file) {

	if (mm->exe_file) {

		app_cookie = fast_get_dcookie(&mm->exe_file->f_path);

		app_cookie = fast_get_dcookie(&mm->exe_file->f_path);

		pr_debug("got dcookie for %s\n",

		pr_debug("got dcookie for %pD\n", mm->exe_file);

			 mm->exe_file->f_dentry->d_name.name);

	}

	}





	for (vma = mm->mmap; vma; vma = vma->vm_next) {

	for (vma = mm->mmap; vma; vma = vma->vm_next) {
@@ -342,15 +341,14 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp, 
		if (!vma->vm_file)

		if (!vma->vm_file)

			goto fail_no_image_cookie;

			goto fail_no_image_cookie;





		pr_debug("Found spu ELF at %X(object-id:%lx) for file %s\n",

		pr_debug("Found spu ELF at %X(object-id:%lx) for file %pD\n",

			 my_offset, spu_ref,

			 my_offset, spu_ref, vma->vm_file);

			 vma->vm_file->f_dentry->d_name.name);

		*offsetp = my_offset;

		*offsetp = my_offset;

		break;

		break;

	}

	}





	*spu_bin_dcookie = fast_get_dcookie(&vma->vm_file->f_path);

	*spu_bin_dcookie = fast_get_dcookie(&vma->vm_file->f_path);

	pr_debug("got dcookie for %s\n", vma->vm_file->f_dentry->d_name.name);

	pr_debug("got dcookie for %pD\n", vma->vm_file);





	up_read(&mm->mmap_sem);

	up_read(&mm->mmap_sem);

arch/s390/hypfs/hypfs_dbfs.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -83,10 +83,9 @@ static ssize_t dbfs_read(struct file *file, char __user *buf, 




static long dbfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

static long dbfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

{

	struct hypfs_dbfs_file *df;

	struct hypfs_dbfs_file *df = file_inode(file)->i_private;

	long rc;

	long rc;





	df = file->f_path.dentry->d_inode->i_private;

	mutex_lock(&df->lock);

	mutex_lock(&df->lock);

	if (df->unlocked_ioctl)

	if (df->unlocked_ioctl)

		rc = df->unlocked_ioctl(file, cmd, arg);

		rc = df->unlocked_ioctl(file, cmd, arg);

arch/x86/ia32/ia32_aout.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -342,8 +342,8 @@ static int load_aout_binary(struct linux_binprm *bprm) 
			    time_after(jiffies, error_time + 5*HZ)) {

			    time_after(jiffies, error_time + 5*HZ)) {

			printk(KERN_WARNING

			printk(KERN_WARNING

			       "fd_offset is not page aligned. Please convert "

			       "fd_offset is not page aligned. Please convert "

			       "program: %s\n",

			       "program: %pD\n",

			       bprm->file->f_path.dentry->d_name.name);

			       bprm->file);

			error_time = jiffies;

			error_time = jiffies;

		}

		}

#endif

#endif
@@ -429,8 +429,8 @@ static int load_aout_library(struct file *file) 
		if (time_after(jiffies, error_time + 5*HZ)) {

		if (time_after(jiffies, error_time + 5*HZ)) {

			printk(KERN_WARNING

			printk(KERN_WARNING

			       "N_TXTOFF is not page aligned. Please convert "

			       "N_TXTOFF is not page aligned. Please convert "

			       "library: %s\n",

			       "library: %pD\n",

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

			       file);

			error_time = jiffies;

			error_time = jiffies;

		}

		}

#endif

#endif

drivers/gpu/drm/armada/armada_gem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -226,7 +226,7 @@ struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev, 




	obj->dev_addr = DMA_ERROR_CODE;

	obj->dev_addr = DMA_ERROR_CODE;





	mapping = obj->obj.filp->f_path.dentry->d_inode->i_mapping;

	mapping = file_inode(obj->obj.filp)->i_mapping;

	mapping_set_gfp_mask(mapping, GFP_HIGHUSER | __GFP_RECLAIMABLE);

	mapping_set_gfp_mask(mapping, GFP_HIGHUSER | __GFP_RECLAIMABLE);





	DRM_DEBUG_DRIVER("alloc obj %p size %zu\n", obj, size);

	DRM_DEBUG_DRIVER("alloc obj %p size %zu\n", obj, size);

drivers/media/pci/zoran/zoran_procfs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -157,8 +157,8 @@ static ssize_t zoran_write(struct file *file, const char __user *buffer, 
		return -EFAULT;

		return -EFAULT;

	}

	}

	string[count] = 0;

	string[count] = 0;

	dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n",

	dprintk(4, KERN_INFO "%s: write_proc: name=%pD count=%zu zr=%p\n",

		ZR_DEVNAME(zr), file->f_path.dentry->d_name.name, count, zr);

		ZR_DEVNAME(zr), file, count, zr);

	ldelim = " \t\n";

	ldelim = " \t\n";

	tdelim = "=";

	tdelim = "=";

	line = strpbrk(sp, ldelim);

	line = strpbrk(sp, ldelim);