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

Commit d9b4b319 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/coda: replace printk by pr_foo() 



No level printk converted to pr_warn or pr_info

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Jan Harkes <jaharkes@cs.cmu.edu>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 817e1d90

fs/coda/cnode.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct inode *coda_cnode_make(struct CodaFid *fid, struct super_block *sb) 


	inode = coda_iget(sb, fid, &attr);

	if (IS_ERR(inode))

		printk("coda_cnode_make: coda_iget failed\n");

		pr_warn("coda_cnode_make: coda_iget failed\n");

	return inode;

}
@@ -137,7 +137,7 @@ struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb) 
	unsigned long hash = coda_f2i(fid);



	if ( !sb ) {

		printk("coda_fid_to_inode: no sb!\n");

		pr_warn("coda_fid_to_inode: no sb!\n");

		return NULL;

	}

fs/coda/coda_linux.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void coda_sysctl_clean(void); 
    else \

        ptr = (cast)vzalloc((unsigned long) size); \

    if (!ptr) \

        printk("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \

	pr_warn("kernel malloc returns 0 at %s:%d\n", __FILE__, __LINE__); \

} while (0)

fs/coda/dir.c

+6 −6
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct dentry *coda_lookup(struct inode *dir, struct dentry *entry, unsig 
	int type = 0;



	if (length > CODA_MAXNAMLEN) {

		printk(KERN_ERR "name too long: lookup, %s (%*s)\n",

		pr_err("name too long: lookup, %s (%*s)\n",

		       coda_i2s(dir), (int)length, name);

		return ERR_PTR(-ENAMETOOLONG);

	}
@@ -453,7 +453,7 @@ static int coda_venus_readdir(struct file *coda_file, struct dir_context *ctx) 
		ret = kernel_read(host_file, ctx->pos - 2, (char *)vdir,

				  sizeof(*vdir));

		if (ret < 0) {

			printk(KERN_ERR "coda readdir: read dir %s failed %d\n",

			pr_err("coda readdir: read dir %s failed %d\n",

			       coda_f2s(&cii->c_fid), ret);

			break;

		}
@@ -461,14 +461,14 @@ static int coda_venus_readdir(struct file *coda_file, struct dir_context *ctx) 


		/* catch truncated reads */

		if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) {

			printk(KERN_ERR "coda readdir: short read on %s\n",

			pr_err("coda readdir: short read on %s\n",

			       coda_f2s(&cii->c_fid));

			ret = -EBADF;

			break;

		}

		/* validate whether the directory file actually makes sense */

		if (vdir->d_reclen < vdir_size + vdir->d_namlen) {

			printk(KERN_ERR "coda readdir: invalid dir %s\n",

			pr_err("coda readdir: invalid dir %s\n",

			       coda_f2s(&cii->c_fid));

			ret = -EBADF;

			break;
@@ -589,7 +589,7 @@ int coda_revalidate_inode(struct inode *inode) 
		coda_vattr_to_iattr(inode, &attr);



		if ((old_mode & S_IFMT) != (inode->i_mode & S_IFMT)) {

			printk("Coda: inode %ld, fid %s changed type!\n",

			pr_warn("Coda: inode %ld, fid %s changed type!\n",

				inode->i_ino, coda_f2s(&(cii->c_fid)));

		}

fs/coda/inode.c

+15 −14
Original line number Diff line number Diff line
@@ -119,12 +119,12 @@ static int get_device_index(struct coda_mount_data *data) 
	int idx;



	if (data == NULL) {

		printk("coda_read_super: Bad mount data\n");

		pr_warn("coda_read_super: Bad mount data\n");

		return -1;

	}



	if (data->version != CODA_MOUNT_VERSION) {

		printk("coda_read_super: Bad mount version\n");

		pr_warn("coda_read_super: Bad mount version\n");

		return -1;

	}
@@ -141,13 +141,13 @@ static int get_device_index(struct coda_mount_data *data) 
	fdput(f);



	if (idx < 0 || idx >= MAX_CODADEVS) {

		printk("coda_read_super: Bad minor number\n");

		pr_warn("coda_read_super: Bad minor number\n");

		return -1;

	}



	return idx;

Ebadf:

	printk("coda_read_super: Bad file\n");

	pr_warn("coda_read_super: Bad file\n");

	return -1;

}
@@ -168,19 +168,19 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) 
	if(idx == -1)

		idx = 0;

	

	printk(KERN_INFO "coda_read_super: device index: %i\n", idx);

	pr_info("coda_read_super: device index: %i\n", idx);



	vc = &coda_comms[idx];

	mutex_lock(&vc->vc_mutex);



	if (!vc->vc_inuse) {

		printk("coda_read_super: No pseudo device\n");

		pr_warn("coda_read_super: No pseudo device\n");

		error = -EINVAL;

		goto unlock_out;

	}



	if (vc->vc_sb) {

		printk("coda_read_super: Device already mounted\n");

		pr_warn("coda_read_super: Device already mounted\n");

		error = -EBUSY;

		goto unlock_out;

	}
@@ -204,21 +204,22 @@ static int coda_fill_super(struct super_block *sb, void *data, int silent) 
	/* get root fid from Venus: this needs the root inode */

	error = venus_rootfid(sb, &fid);

	if ( error ) {

	        printk("coda_read_super: coda_get_rootfid failed with %d\n",

		pr_warn("coda_read_super: coda_get_rootfid failed with %d\n",

			error);

		goto error;

	}

	printk("coda_read_super: rootfid is %s\n", coda_f2s(&fid));

	pr_info("coda_read_super: rootfid is %s\n", coda_f2s(&fid));

	

	/* make root inode */

        root = coda_cnode_make(&fid, sb);

        if (IS_ERR(root)) {

		error = PTR_ERR(root);

		printk("Failure of coda_cnode_make for root: error %d\n", error);

		pr_warn("Failure of coda_cnode_make for root: error %d\n",

			error);

		goto error;

	} 



	printk("coda_read_super: rootinode is %ld dev %s\n", 

	pr_info("coda_read_super: rootinode is %ld dev %s\n",

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

	sb->s_root = d_make_root(root);

	if (!sb->s_root) {
@@ -246,7 +247,7 @@ static void coda_put_super(struct super_block *sb) 
	sb->s_fs_info = NULL;

	mutex_unlock(&vcp->vc_mutex);



	printk("Coda: Bye bye.\n");

	pr_info("Coda: Bye bye.\n");

}



static void coda_evict_inode(struct inode *inode)

fs/coda/psdev.c

+17 −17
Original line number Diff line number Diff line
@@ -114,13 +114,13 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf, 
		int size = sizeof(*dcbuf);



		if  ( nbytes < sizeof(struct coda_out_hdr) ) {

		        printk("coda_downcall opc %d uniq %d, not enough!\n",

			pr_warn("coda_downcall opc %d uniq %d, not enough!\n",

				hdr.opcode, hdr.unique);

			count = nbytes;

			goto out;

		}

		if ( nbytes > size ) {

		        printk("Coda: downcall opc %d, uniq %d, too much!",

			pr_warn("Coda: downcall opc %d, uniq %d, too much!",

				hdr.opcode, hdr.unique);

		        nbytes = size;

		}
@@ -136,7 +136,8 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf, 


		CODA_FREE(dcbuf, nbytes);

		if (error) {

		        printk("psdev_write: coda_downcall error: %d\n", error);

			pr_warn("psdev_write: coda_downcall error: %d\n",

				error);

			retval = error;

			goto out;

		}
@@ -157,7 +158,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf, 
	mutex_unlock(&vcp->vc_mutex);



	if (!req) {

		printk("psdev_write: msg (%d, %d) not found\n", 

		pr_warn("psdev_write: msg (%d, %d) not found\n",

			hdr.opcode, hdr.unique);

		retval = -ESRCH;

		goto out;
@@ -165,7 +166,7 @@ static ssize_t coda_psdev_write(struct file *file, const char __user *buf, 


        /* move data into response buffer. */

	if (req->uc_outSize < nbytes) {

                printk("psdev_write: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n",

		pr_warn("psdev_write: too much cnt: %d, cnt: %ld, opc: %d, uniq: %d.\n",

			req->uc_outSize, (long)nbytes, hdr.opcode, hdr.unique);

		nbytes = req->uc_outSize; /* don't have more space! */

	}
@@ -240,7 +241,7 @@ static ssize_t coda_psdev_read(struct file * file, char __user * buf, 
	/* Move the input args into userspace */

	count = req->uc_inSize;

	if (nbytes < req->uc_inSize) {

                printk ("psdev_read: Venus read %ld bytes of %d in message\n",

		pr_warn("psdev_read: Venus read %ld bytes of %d in message\n",

			(long)nbytes, req->uc_inSize);

		count = nbytes;

        }
@@ -305,7 +306,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file) 
	struct upc_req *req, *tmp;



	if (!vcp || !vcp->vc_inuse ) {

		printk("psdev_release: Not open.\n");

		pr_warn("psdev_release: Not open.\n");

		return -1;

	}
@@ -354,7 +355,7 @@ static int init_coda_psdev(void) 
{

	int i, err = 0;

	if (register_chrdev(CODA_PSDEV_MAJOR, "coda", &coda_psdev_fops)) {

              printk(KERN_ERR "coda_psdev: unable to get major %d\n", 

		pr_err("coda_psdev: unable to get major %d\n",

		       CODA_PSDEV_MAJOR);

              return -EIO;

	}
@@ -393,13 +394,13 @@ static int __init init_coda(void) 
		goto out2;

	status = init_coda_psdev();

	if ( status ) {

		printk("Problem (%d) in init_coda_psdev\n", status);

		pr_warn("Problem (%d) in init_coda_psdev\n", status);

		goto out1;

	}

	

	status = register_filesystem(&coda_fs_type);

	if (status) {

		printk("coda: failed to register filesystem!\n");

		pr_warn("coda: failed to register filesystem!\n");

		goto out;

	}

	return 0;
@@ -420,9 +421,8 @@ static void __exit exit_coda(void) 
        int err, i;



	err = unregister_filesystem(&coda_fs_type);

        if ( err != 0 ) {

                printk("coda: failed to unregister filesystem\n");

        }

	if (err != 0)

		pr_warn("coda: failed to unregister filesystem\n");

	for (i = 0; i < MAX_CODADEVS; i++)

		device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));

	class_destroy(coda_psdev_class);