Skip to contentSkip to conversation

DCCP: fix printk format warnings

PATCH Applied Randy Dunlap 3 participants 4 messages Oct 29, 2006 – Oct 30, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 DCCP: fix printk format warnings

From: Randy Dunlap <[email protected]>

Fix printk format warnings:
build2.out:net/dccp/ccids/ccid2.c:355: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:360: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:482: warning: long long unsigned int format, u64 arg (arg 5) build2.out:net/dccp/ccids/ccid2.c:639: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:639: warning: long long unsigned int format, u64 arg (arg 4) build2.out:net/dccp/ccids/ccid2.c:674: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:720: warning: long long unsigned int format, u64 arg (arg 3)

---

 net/dccp/ccids/ccid2.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
net/dccp/ccids/ccid2.c renamed from net/dccp/ccids/ccid2.c~net_dccp_ccids_printk +10 -8
diff -Naurp linux-2.6.19-rc3-git5/net/dccp/ccids/ccid2.c~net_dccp_ccids_printk linux-2.6.19-rc3-git5/net/dccp/ccids/ccid2.c
@@ -352,14 +352,14 @@ static void ccid2_hc_tx_packet_sent(stru
 
 #ifdef CONFIG_IP_DCCP_CCID2_DEBUG
 	ccid2_pr_debug("pipe=%d\n", hctx->ccid2hctx_pipe);
-	ccid2_pr_debug("Sent: seq=%llu\n", seq);
+	ccid2_pr_debug("Sent: seq=%llu\n", (unsigned long long)seq);
 	do {
 		struct ccid2_seq *seqp = hctx->ccid2hctx_seqt;
 
 		while (seqp != hctx->ccid2hctx_seqh) {
 			ccid2_pr_debug("out seq=%llu acked=%d time=%lu\n",
-			       	       seqp->ccid2s_seq, seqp->ccid2s_acked,
-				       seqp->ccid2s_sent);
+			       	       (unsigned long long)seqp->ccid2s_seq,
+				       seqp->ccid2s_acked, seqp->ccid2s_sent);
 			seqp = seqp->ccid2s_next;
 		}
 	} while (0);
@@ -480,7 +480,8 @@ static inline void ccid2_new_ack(struct 
 		/* first measurement */
 		if (hctx->ccid2hctx_srtt == -1) {
 			ccid2_pr_debug("R: %lu Time=%lu seq=%llu\n",
-			       	       r, jiffies, seqp->ccid2s_seq);
+			       	       r, jiffies,
+				       (unsigned long long)seqp->ccid2s_seq);
 			ccid2_change_srtt(hctx, r);
 			hctx->ccid2hctx_rttvar = r >> 1;
 		} else {
@@ -636,8 +637,9 @@ static void ccid2_hc_tx_packet_recv(stru
 			u64 ackno_end_rl;
 
 			dccp_set_seqno(&ackno_end_rl, ackno - rl);
-			ccid2_pr_debug("ackvec start:%llu end:%llu\n", ackno,
-				       ackno_end_rl);
+			ccid2_pr_debug("ackvec start:%llu end:%llu\n",
+				       (unsigned long long)ackno,
+				       (unsigned long long)ackno_end_rl);
 			/* if the seqno we are analyzing is larger than the
 			 * current ackno, then move towards the tail of our
 			 * seqnos.
@@ -672,7 +674,7 @@ static void ccid2_hc_tx_packet_recv(stru
 
 					seqp->ccid2s_acked = 1;
 					ccid2_pr_debug("Got ack for %llu\n",
-					       	       seqp->ccid2s_seq);
+						       (unsigned long long)seqp->ccid2s_seq);
 					ccid2_hc_tx_dec_pipe(sk);
 				}
 				if (seqp == hctx->ccid2hctx_seqt) {
@@ -718,7 +720,7 @@ static void ccid2_hc_tx_packet_recv(stru
 		while (1) {
 			if (!seqp->ccid2s_acked) {
 				ccid2_pr_debug("Packet lost: %llu\n",
-					       seqp->ccid2s_seq);
+					       (unsigned long long)seqp->ccid2s_seq);
 				/* XXX need to traverse from tail -> head in
 				 * order to detect multiple congestion events in
 				 * one ack vector.

---

maintainer Applied
#1 lore raw

From: Randy Dunlap <[email protected]>
Date: Sun, 29 Oct 2006 13:24:40 -0800

Quoted 10 lines

Fix printk format warnings:
build2.out:net/dccp/ccids/ccid2.c:355: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:360: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:482: warning: long long unsigned int format, u64 arg (arg 5) build2.out:net/dccp/ccids/ccid2.c:639: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:639: warning: long long unsigned int format, u64 arg (arg 4) build2.out:net/dccp/ccids/ccid2.c:674: warning: long long unsigned int format, u64 arg (arg 3) build2.out:net/dccp/ccids/ccid2.c:720: warning: long long unsigned int format, u64 arg (arg 3)

Applied, thanks a lot Randy.

#2 lore raw

[RFC] Any strong reason why socket dentries are hashed in global d_hash table ?

In sock_attach_fd(), we are currently using

d_add(file->f_dentry, SOCK_INODE(sock));

This has the effect to insert the dentry into the dentry_hashtable.

I was wondering if it is really necessary : On a machine with many sockets, the dentry_hashtable lookups may be slowed down for no good reason. (sockets are not accessable by other means than socket() syscall, and not subject to 'unuse and LRU freeable syndrom').

If we replace d_add(file->f_dentry, SOCK_INODE(sock)) call by
d_instantiate(file->f_dentry, SOCK_INODE(sock)), we also avoid using rcu callback when socket is closed. (We would have to not provide a d_op->d_delete () method in sockfs_dentry_operations)

Maybe I just provide a patch instead of just talking ? :)

Eric

maintainer
#3 lore raw

Re: [RFC] Any strong reason why socket dentries are hashed in global d_hash table ?

From: Eric Dumazet <[email protected]>
Date: Mon, 30 Oct 2006 22:30:39 +0100

Quoted 11 lines

In sock_attach_fd(), we are currently using

d_add(file->f_dentry, SOCK_INODE(sock));

This has the effect to insert the dentry into the dentry_hashtable.

I was wondering if it is really necessary : On a machine with many sockets, the dentry_hashtable lookups may be slowed down for no good reason. (sockets are not accessable by other means than socket() syscall, and not subject to 'unuse and LRU freeable syndrom').

Quoted 4 lines

If we replace d_add(file->f_dentry, SOCK_INODE(sock)) call by d_instantiate(file->f_dentry, SOCK_INODE(sock)), we also avoid using rcu callback when socket is closed. (We would have to not provide a d_op->d_delete () method in sockfs_dentry_operations)

Sounds like a useful optimization for sure.

You can't mount sockfs on the filesystem, but they are visible via /proc/${pid}/fd/, I wonder if the dentry hashing is required just to make those nodes visible properly?