Commit 8207649c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew Morton) 

Merge fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: softdirty: keep bit when zapping file pte
  fs/cachefiles: add missing \n to kerror conversions
  genalloc: fix device node resource counter
  drivers/rtc/rtc-efi.c: add missing module alias
  mm, slab: initialize object alignment on cache creation
  mm: softdirty: addresses before VMAs in PTE holes aren't softdirty
  ocfs2/dlm: do not get resource spinlock if lockres is new
  nilfs2: fix data loss with mmap()
  ocfs2: free vol_label in ocfs2_delete_osb()
parents f4cb707e dbab31aa

drivers/rtc/rtc-efi.c

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static struct platform_driver efi_rtc_driver = { 


module_platform_driver_probe(efi_rtc_driver, efi_rtc_probe);



MODULE_ALIAS("platform:rtc-efi");

MODULE_AUTHOR("dann frazier <dannf@hp.com>");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("EFI RTC driver");

fs/cachefiles/bind.c

+4 −4
Original line number Diff line number Diff line
@@ -50,18 +50,18 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args) 
	       cache->brun_percent  < 100);



	if (*args) {

		pr_err("'bind' command doesn't take an argument");

		pr_err("'bind' command doesn't take an argument\n");

		return -EINVAL;

	}



	if (!cache->rootdirname) {

		pr_err("No cache directory specified");

		pr_err("No cache directory specified\n");

		return -EINVAL;

	}



	/* don't permit already bound caches to be re-bound */

	if (test_bit(CACHEFILES_READY, &cache->flags)) {

		pr_err("Cache already bound");

		pr_err("Cache already bound\n");

		return -EBUSY;

	}
@@ -248,7 +248,7 @@ error_open_root: 
	kmem_cache_free(cachefiles_object_jar, fsdef);

error_root_object:

	cachefiles_end_secure(cache, saved_cred);

	pr_err("Failed to register: %d", ret);

	pr_err("Failed to register: %d\n", ret);

	return ret;

}

fs/cachefiles/daemon.c

+15 −15
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static unsigned int cachefiles_daemon_poll(struct file *file, 
static int cachefiles_daemon_range_error(struct cachefiles_cache *cache,

					 char *args)

{

	pr_err("Free space limits must be in range 0%%<=stop<cull<run<100%%");

	pr_err("Free space limits must be in range 0%%<=stop<cull<run<100%%\n");



	return -EINVAL;

}
@@ -475,12 +475,12 @@ static int cachefiles_daemon_dir(struct cachefiles_cache *cache, char *args) 
	_enter(",%s", args);



	if (!*args) {

		pr_err("Empty directory specified");

		pr_err("Empty directory specified\n");

		return -EINVAL;

	}



	if (cache->rootdirname) {

		pr_err("Second cache directory specified");

		pr_err("Second cache directory specified\n");

		return -EEXIST;

	}
@@ -503,12 +503,12 @@ static int cachefiles_daemon_secctx(struct cachefiles_cache *cache, char *args) 
	_enter(",%s", args);



	if (!*args) {

		pr_err("Empty security context specified");

		pr_err("Empty security context specified\n");

		return -EINVAL;

	}



	if (cache->secctx) {

		pr_err("Second security context specified");

		pr_err("Second security context specified\n");

		return -EINVAL;

	}
@@ -531,7 +531,7 @@ static int cachefiles_daemon_tag(struct cachefiles_cache *cache, char *args) 
	_enter(",%s", args);



	if (!*args) {

		pr_err("Empty tag specified");

		pr_err("Empty tag specified\n");

		return -EINVAL;

	}
@@ -562,12 +562,12 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args) 
		goto inval;



	if (!test_bit(CACHEFILES_READY, &cache->flags)) {

		pr_err("cull applied to unready cache");

		pr_err("cull applied to unready cache\n");

		return -EIO;

	}



	if (test_bit(CACHEFILES_DEAD, &cache->flags)) {

		pr_err("cull applied to dead cache");

		pr_err("cull applied to dead cache\n");

		return -EIO;

	}
@@ -587,11 +587,11 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args) 


notdir:

	path_put(&path);

	pr_err("cull command requires dirfd to be a directory");

	pr_err("cull command requires dirfd to be a directory\n");

	return -ENOTDIR;



inval:

	pr_err("cull command requires dirfd and filename");

	pr_err("cull command requires dirfd and filename\n");

	return -EINVAL;

}
@@ -614,7 +614,7 @@ static int cachefiles_daemon_debug(struct cachefiles_cache *cache, char *args) 
	return 0;



inval:

	pr_err("debug command requires mask");

	pr_err("debug command requires mask\n");

	return -EINVAL;

}
@@ -634,12 +634,12 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args) 
		goto inval;



	if (!test_bit(CACHEFILES_READY, &cache->flags)) {

		pr_err("inuse applied to unready cache");

		pr_err("inuse applied to unready cache\n");

		return -EIO;

	}



	if (test_bit(CACHEFILES_DEAD, &cache->flags)) {

		pr_err("inuse applied to dead cache");

		pr_err("inuse applied to dead cache\n");

		return -EIO;

	}
@@ -659,11 +659,11 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args) 


notdir:

	path_put(&path);

	pr_err("inuse command requires dirfd to be a directory");

	pr_err("inuse command requires dirfd to be a directory\n");

	return -ENOTDIR;



inval:

	pr_err("inuse command requires dirfd and filename");

	pr_err("inuse command requires dirfd and filename\n");

	return -EINVAL;

}

fs/cachefiles/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ extern int cachefiles_remove_object_xattr(struct cachefiles_cache *cache, 


#define cachefiles_io_error(___cache, FMT, ...)		\

do {							\

	pr_err("I/O Error: " FMT, ##__VA_ARGS__);	\

	pr_err("I/O Error: " FMT"\n", ##__VA_ARGS__);	\

	fscache_io_error(&(___cache)->cache);		\

	set_bit(CACHEFILES_DEAD, &(___cache)->flags);	\

} while (0)

fs/cachefiles/main.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ error_proc: 
error_object_jar:

	misc_deregister(&cachefiles_dev);

error_dev:

	pr_err("failed to register: %d", ret);

	pr_err("failed to register: %d\n", ret);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE