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

Commit f9fd2d9c authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

NFS: printks in fs/nfs/ should start with NFS: 



Messages like "Got error -10052 from the server on DESTROY_SESSION. Session
has been destroyed regardless" can be confusing to users who aren't very
familiar with NFS.

NOTE: This patch ignores any printks() that start by printing __func__ - that
will be in a separate patch.

Signed-off-by: default avatarWeston Andros Adamson <dros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 87e3c055

fs/nfs/idmap.c

+2 −1
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ int nfs_idmap_init(void) 
	struct key *keyring;

	int ret = 0;



	printk(KERN_NOTICE "Registering the %s key type\n", key_type_id_resolver.name);

	printk(KERN_NOTICE "NFS: Registering the %s key type\n",

		key_type_id_resolver.name);



	cred = prepare_kernel_cred(NULL);

	if (!cred)

fs/nfs/nfs4filelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, 
			goto out_err_free;

		fl->fh_array[i]->size = be32_to_cpup(p++);

		if (sizeof(struct nfs_fh) < fl->fh_array[i]->size) {

			printk(KERN_ERR "Too big fh %d received %d\n",

			printk(KERN_ERR "NFS: Too big fh %d received %d\n",

			       i, fl->fh_array[i]->size);

			goto out_err_free;

		}

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -5406,7 +5406,7 @@ int nfs4_proc_destroy_session(struct nfs4_session *session) 


	if (status)

		printk(KERN_WARNING

			"Got error %d from the server on DESTROY_SESSION. "

			"NFS: Got error %d from the server on DESTROY_SESSION. "

			"Session has been destroyed regardless...\n", status);



	dprintk("<-- nfs4_proc_destroy_session\n");

fs/nfs/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -1764,7 +1764,7 @@ static void nfs4_state_manager(struct nfs_client *clp) 
	} while (atomic_read(&clp->cl_count) > 1);

	return;

out_error:

	printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"

	printk(KERN_WARNING "NFS: state manager failed on NFSv4 server %s"

			" with error %d\n", clp->cl_hostname, -status);

	nfs4_end_drain_session(clp);

	nfs4_clear_state_manager_bit(clp);

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const 
	 * Now we backfill the bitmap and the attribute buffer length.

	 */

	if (len != ((char *)p - (char *)q) + 4) {

		printk(KERN_ERR "nfs: Attr length error, %u != %Zu\n",

		printk(KERN_ERR "NFS: Attr length error, %u != %Zu\n",

				len, ((char *)p - (char *)q) + 4);

		BUG();

	}