The patch titled
FS-Cache: CacheFiles: Fix up warnings
has been removed from the -mm tree. Its filename was
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: FS-Cache: CacheFiles: Fix up warnings
From: David Howells <dhowells@xxxxxxxxxx>
Fix up warnings in the CacheFiles patch.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/cachefiles/cf-bind.c | 10 ++++++----
fs/cachefiles/cf-interface.c | 15 +++++++++++----
fs/cachefiles/cf-proc.c | 6 +++---
3 files changed, 20 insertions(+), 11 deletions(-)
diff -puN fs/cachefiles/cf-bind.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes fs/cachefiles/cf-bind.c
--- a/fs/cachefiles/cf-bind.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes
+++ a/fs/cachefiles/cf-bind.c
@@ -173,7 +173,9 @@ static int cachefiles_proc_add_cache(str
_debug("blksize %u (shift %u)",
cache->bsize, cache->bshift);
- _debug("size %llu, avail %llu", stats.f_blocks, stats.f_bavail);
+ _debug("size %llu, avail %llu",
+ (unsigned long long) stats.f_blocks,
+ (unsigned long long) stats.f_bavail);
/* set up caching limits */
stats.f_blocks >>= cache->bshift;
@@ -183,9 +185,9 @@ static int cachefiles_proc_add_cache(str
cache->brun = stats.f_blocks * cache->brun_percent;
_debug("limits {%llu,%llu,%llu}",
- cache->brun,
- cache->bcull,
- cache->bstop);
+ (unsigned long long) cache->brun,
+ (unsigned long long) cache->bcull,
+ (unsigned long long) cache->bstop);
/* get the cache directory and check its type */
cachedir = cachefiles_get_directory(cache, root, "cache");
diff -puN fs/cachefiles/cf-interface.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes fs/cachefiles/cf-interface.c
--- a/fs/cachefiles/cf-interface.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes
+++ a/fs/cachefiles/cf-interface.c
@@ -323,7 +323,10 @@ int cachefiles_has_space(struct cachefil
int ret;
_enter("{%llu,%llu,%llu},%d",
- cache->brun, cache->bcull, cache->bstop, nr);
+ (unsigned long long) cache->brun,
+ (unsigned long long) cache->bcull,
+ (unsigned long long) cache->bstop,
+ nr);
/* find out how many pages of blockdev are available */
memset(&stats, 0, sizeof(stats));
@@ -337,7 +340,7 @@ int cachefiles_has_space(struct cachefil
stats.f_bavail >>= cache->bshift;
- _debug("avail %llu", stats.f_bavail);
+ _debug("avail %llu", (unsigned long long) stats.f_bavail);
/* see if there is sufficient space */
stats.f_bavail -= nr;
@@ -715,7 +718,9 @@ static int cachefiles_read_or_alloc_page
block0 <<= shift;
block = inode->i_mapping->a_ops->bmap(inode->i_mapping, block0);
- _debug("%llx -> %llx", block0, block);
+ _debug("%llx -> %llx",
+ (unsigned long long) block0,
+ (unsigned long long) block);
if (block) {
/* submit the apparently valid page to the backing fs to be
@@ -1040,7 +1045,9 @@ static int cachefiles_read_or_alloc_page
block = inode->i_mapping->a_ops->bmap(inode->i_mapping,
block0);
- _debug("%llx -> %llx", block0, block);
+ _debug("%llx -> %llx",
+ (unsigned long long) block0,
+ (unsigned long long) block);
if (block) {
/* we have data - add it to the list to give to the
diff -puN fs/cachefiles/cf-proc.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes fs/cachefiles/cf-proc.c
--- a/fs/cachefiles/cf-proc.c~fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes
+++ a/fs/cachefiles/cf-proc.c
@@ -162,9 +162,9 @@ static ssize_t cachefiles_proc_read(stru
" bcull=%llx"
" bstop=%llx",
test_bit(CACHEFILES_CULLING, &cache->flags) ? '1' : '0',
- cache->brun,
- cache->bcull,
- cache->bstop
+ (unsigned long long) cache->brun,
+ (unsigned long long) cache->bcull,
+ (unsigned long long) cache->bstop
);
if (n > buflen)
_
Patches currently in -mm which might be from dhowells@xxxxxxxxxx are
origin.patch
nfs-represent-64-bit-fileids-as-64-bit-inode-numbers-on-32-bit-systems.patch
security-keys-user-kmemdup.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-fix.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-vs-git-cryptodev.patch
log2-implement-a-general-integer-log2-facility-in-the-kernel-ppc-fix.patch
log2-alter-roundup_pow_of_two-so-that-it-can-use-a-ilog2-on-a-constant.patch
log2-alter-get_order-so-that-it-can-make-use-of-ilog2-on-a-constant.patch
log2-provide-ilog2-fallbacks-for-powerpc.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-warning-fixes.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-cachefiles_write_page-shouldnt-indicate-error-twice.patch
fscache-kconfig-tidying.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-log2-fix.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-cachefiles-handle-enospc-on-create-mkdir-better.patch
fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-inode-count-maintenance.patch
afs-amend-the-afs-configuration-options.patch
reiser4-get_sb_dev-fix.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
