diff options
author | David Teigland <teigland@redhat.com> | 2006-05-24 09:21:30 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-05-24 09:21:30 -0400 |
commit | 9229f013495dcdae76e9942ebc2cfc69851fe10a (patch) | |
tree | 46c3b25ea005fd2fdbc17a510d30d40e3abd39e1 /fs/gfs2/locking/dlm/plock.c | |
parent | 90cdd2083aea9a536ecdef62840db01fff2e645d (diff) |
[GFS2] Cast 64 bit printk args to unsigned long long.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking/dlm/plock.c')
-rw-r--r-- | fs/gfs2/locking/dlm/plock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c index 86312d96147b..6adfb2d4fd8c 100644 --- a/fs/gfs2/locking/dlm/plock.c +++ b/fs/gfs2/locking/dlm/plock.c | |||
@@ -93,7 +93,8 @@ int gdlm_plock(lm_lockspace_t *lockspace, struct lm_lockname *name, | |||
93 | if (!rv) { | 93 | if (!rv) { |
94 | if (posix_lock_file_wait(file, fl) < 0) | 94 | if (posix_lock_file_wait(file, fl) < 0) |
95 | log_error("gdlm_plock: vfs lock error %x,%llx", | 95 | log_error("gdlm_plock: vfs lock error %x,%llx", |
96 | name->ln_type, name->ln_number); | 96 | name->ln_type, |
97 | (unsigned long long)name->ln_number); | ||
97 | } | 98 | } |
98 | 99 | ||
99 | kfree(op); | 100 | kfree(op); |
@@ -113,7 +114,7 @@ int gdlm_punlock(lm_lockspace_t *lockspace, struct lm_lockname *name, | |||
113 | 114 | ||
114 | if (posix_lock_file_wait(file, fl) < 0) | 115 | if (posix_lock_file_wait(file, fl) < 0) |
115 | log_error("gdlm_punlock: vfs unlock error %x,%llx", | 116 | log_error("gdlm_punlock: vfs unlock error %x,%llx", |
116 | name->ln_type, name->ln_number); | 117 | name->ln_type, (unsigned long long)name->ln_number); |
117 | 118 | ||
118 | op->info.optype = GDLM_PLOCK_OP_UNLOCK; | 119 | op->info.optype = GDLM_PLOCK_OP_UNLOCK; |
119 | op->info.pid = fl->fl_pid; | 120 | op->info.pid = fl->fl_pid; |
@@ -243,7 +244,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count, | |||
243 | wake_up(&recv_wq); | 244 | wake_up(&recv_wq); |
244 | else | 245 | else |
245 | printk(KERN_INFO "gdlm dev_write no op %x %llx\n", info.fsid, | 246 | printk(KERN_INFO "gdlm dev_write no op %x %llx\n", info.fsid, |
246 | info.number); | 247 | (unsigned long long)info.number); |
247 | return count; | 248 | return count; |
248 | } | 249 | } |
249 | 250 | ||