git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
fs
/
cifs
/
cache.c
diff --git
a/fs/cifs/cache.c
b/fs/cifs/cache.c
index
dd8584d
..
545509c
100644
(file)
--- a/
fs/cifs/cache.c
+++ b/
fs/cifs/cache.c
@@
-92,7
+92,7
@@
static uint16_t cifs_server_get_key(const void *cookie_netfs_data,
break;
default:
break;
default:
- cERROR(1, "
CIFS:
Unknown network family '%d'", sa->sa_family);
+ cERROR(1, "Unknown network family '%d'", sa->sa_family);
key_len = 0;
break;
}
key_len = 0;
break;
}
@@
-152,7
+152,7
@@
static uint16_t cifs_super_get_key(const void *cookie_netfs_data, void *buffer,
sharename = extract_sharename(tcon->treeName);
if (IS_ERR(sharename)) {
sharename = extract_sharename(tcon->treeName);
if (IS_ERR(sharename)) {
- cFYI(1, "
CIFS: couldn't extract sharename\n"
);
+ cFYI(1, "
%s: couldn't extract sharename\n", __func__
);
sharename = NULL;
return 0;
}
sharename = NULL;
return 0;
}
@@
-302,7
+302,7
@@
static void cifs_fscache_inode_now_uncached(void *cookie_netfs_data)
pagevec_init(&pvec, 0);
first = 0;
pagevec_init(&pvec, 0);
first = 0;
- cFYI(1, "
cifs inode 0x%p now uncached"
, cifsi);
+ cFYI(1, "
%s: cifs inode 0x%p now uncached", __func__
, cifsi);
for (;;) {
nr_pages = pagevec_lookup(&pvec,
for (;;) {
nr_pages = pagevec_lookup(&pvec,