diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 00:09:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 00:09:01 +0100 |
| commit | 609eac1c152353ee4cd6f292d49f0aa0b885951a (patch) | |
| tree | 9274243e8d62427be5b7ec15bc9cd383e482f477 /net/9p/util.c | |
| parent | Merge branch 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | fs/9p: iattr_valid flags are kernel internal flags map them to 9p values. (diff) | |
| download | linux-609eac1c152353ee4cd6f292d49f0aa0b885951a.tar.xz linux-609eac1c152353ee4cd6f292d49f0aa0b885951a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.
fs/9p: We should not allocate a new inode when creating hardlines.
fs/9p: v9fs_stat2inode should update suid/sgid bits.
9p: Reduce object size with CONFIG_NET_9P_DEBUG
fs/9p: check schedule_timeout_interruptible return value
Fix up trivial conflicts in fs/9p/{vfs_inode.c,vfs_inode_dotl.c} due to
debug messages having changed to use p9_debug() on one hand, and the
changes for umode_t on the other.
Diffstat (limited to 'net/9p/util.c')
| -rw-r--r-- | net/9p/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/util.c b/net/9p/util.c index 9c1c9348ac35..6ceeeb384de7 100644 --- a/net/9p/util.c +++ b/net/9p/util.c @@ -106,7 +106,7 @@ retry: else if (error) return -1; - P9_DPRINTK(P9_DEBUG_MUX, " id %d pool %p\n", i, p); + p9_debug(P9_DEBUG_MUX, " id %d pool %p\n", i, p); return i; } EXPORT_SYMBOL(p9_idpool_get); @@ -124,7 +124,7 @@ void p9_idpool_put(int id, struct p9_idpool *p) { unsigned long flags; - P9_DPRINTK(P9_DEBUG_MUX, " id %d pool %p\n", id, p); + p9_debug(P9_DEBUG_MUX, " id %d pool %p\n", id, p); spin_lock_irqsave(&p->lock, flags); idr_remove(&p->pool, id); |