diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2013-08-09 12:47:51 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-03 15:26:30 -0400 |
commit | e8d92382dd65a3dd77ff533b09815c3dc65fa9a9 (patch) | |
tree | 47306f9d883222e2382f8e06c44ab43adf5793cf /fs/nfs/nfs4session.c | |
parent | ba6c05928dcafc7e0a0c8e4ee6a293ba47190fd4 (diff) |
NFS: When displaying session slot numbers, use "%u" consistently
Clean up, since slot and sequence numbers are all unsigned anyway.
Among other things, squelch compiler warnings:
linux/fs/nfs/nfs4proc.c: In function ‘nfs4_setup_sequence’:
linux/fs/nfs/nfs4proc.c:703:2: warning: signed and unsigned type in
conditional expression [-Wsign-compare]
and
linux/fs/nfs/nfs4session.c: In function ‘nfs4_alloc_slot’:
linux/fs/nfs/nfs4session.c:151:31: warning: signed and unsigned type in
conditional expression [-Wsign-compare]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4session.c')
-rw-r--r-- | fs/nfs/nfs4session.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfs4session.c b/fs/nfs/nfs4session.c index 202e3633d555..0161ad26ee84 100644 --- a/fs/nfs/nfs4session.c +++ b/fs/nfs/nfs4session.c | |||
@@ -76,7 +76,7 @@ void nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot) | |||
76 | nfs4_slot_tbl_drain_complete(tbl); | 76 | nfs4_slot_tbl_drain_complete(tbl); |
77 | } | 77 | } |
78 | } | 78 | } |
79 | dprintk("%s: slotid %u highest_used_slotid %d\n", __func__, | 79 | dprintk("%s: slotid %u highest_used_slotid %u\n", __func__, |
80 | slotid, tbl->highest_used_slotid); | 80 | slotid, tbl->highest_used_slotid); |
81 | } | 81 | } |
82 | 82 | ||
@@ -146,9 +146,9 @@ struct nfs4_slot *nfs4_alloc_slot(struct nfs4_slot_table *tbl) | |||
146 | ret->generation = tbl->generation; | 146 | ret->generation = tbl->generation; |
147 | 147 | ||
148 | out: | 148 | out: |
149 | dprintk("<-- %s used_slots=%04lx highest_used=%d slotid=%d \n", | 149 | dprintk("<-- %s used_slots=%04lx highest_used=%u slotid=%u\n", |
150 | __func__, tbl->used_slots[0], tbl->highest_used_slotid, | 150 | __func__, tbl->used_slots[0], tbl->highest_used_slotid, |
151 | !IS_ERR(ret) ? ret->slot_nr : -1); | 151 | !IS_ERR(ret) ? ret->slot_nr : NFS4_NO_SLOT); |
152 | return ret; | 152 | return ret; |
153 | } | 153 | } |
154 | 154 | ||
@@ -191,7 +191,7 @@ static int nfs4_realloc_slot_table(struct nfs4_slot_table *tbl, | |||
191 | { | 191 | { |
192 | int ret; | 192 | int ret; |
193 | 193 | ||
194 | dprintk("--> %s: max_reqs=%u, tbl->max_slots %d\n", __func__, | 194 | dprintk("--> %s: max_reqs=%u, tbl->max_slots %u\n", __func__, |
195 | max_reqs, tbl->max_slots); | 195 | max_reqs, tbl->max_slots); |
196 | 196 | ||
197 | if (max_reqs > NFS4_MAX_SLOT_TABLE) | 197 | if (max_reqs > NFS4_MAX_SLOT_TABLE) |
@@ -205,7 +205,7 @@ static int nfs4_realloc_slot_table(struct nfs4_slot_table *tbl, | |||
205 | nfs4_reset_slot_table(tbl, max_reqs - 1, ivalue); | 205 | nfs4_reset_slot_table(tbl, max_reqs - 1, ivalue); |
206 | spin_unlock(&tbl->slot_tbl_lock); | 206 | spin_unlock(&tbl->slot_tbl_lock); |
207 | 207 | ||
208 | dprintk("%s: tbl=%p slots=%p max_slots=%d\n", __func__, | 208 | dprintk("%s: tbl=%p slots=%p max_slots=%u\n", __func__, |
209 | tbl, tbl->slots, tbl->max_slots); | 209 | tbl, tbl->slots, tbl->max_slots); |
210 | out: | 210 | out: |
211 | dprintk("<-- %s: return %d\n", __func__, ret); | 211 | dprintk("<-- %s: return %d\n", __func__, ret); |