Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88875667 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs 

Pull UBI/UBIFS updates from Richard Weinberger:
 "This contains cleanups and a maintainer update for UBI and UBIFS"

* tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs:
  ubifs: Remove unused header
  MAINTAINERS: Update UBIFS entry
  mtd: ubi: Add logging functions ubi_msg, ubi_warn and ubi_err
  ubifs: Add logging functions for ubifs_msg, ubifs_err and ubifs_warn
parents 8b306a2e c27cb972

MAINTAINERS

+2 −1
Original line number Original line Diff line number Diff line
@@ -11326,12 +11326,13 @@ S: Maintained 
F:	drivers/scsi/u14-34f.c

F:	drivers/scsi/u14-34f.c





UBI FILE SYSTEM (UBIFS)

UBI FILE SYSTEM (UBIFS)

M:	Richard Weinberger <richard@nod.at>

M:	Artem Bityutskiy <dedekind1@gmail.com>

M:	Artem Bityutskiy <dedekind1@gmail.com>

M:	Adrian Hunter <adrian.hunter@intel.com>

M:	Adrian Hunter <adrian.hunter@intel.com>

L:	linux-mtd@lists.infradead.org

L:	linux-mtd@lists.infradead.org

T:	git git://git.infradead.org/ubifs-2.6.git

T:	git git://git.infradead.org/ubifs-2.6.git

W:	http://www.linux-mtd.infradead.org/doc/ubifs.html

W:	http://www.linux-mtd.infradead.org/doc/ubifs.html

S:	Maintained

S:	Supported

F:	Documentation/filesystems/ubifs.txt

F:	Documentation/filesystems/ubifs.txt

F:	fs/ubifs/

F:	fs/ubifs/

drivers/mtd/ubi/misc.c

+49 −0
Original line number Original line Diff line number Diff line
@@ -153,3 +153,52 @@ int ubi_check_pattern(const void *buf, uint8_t patt, int size) 
			return 0;

			return 0;

	return 1;

	return 1;

}

}



/* Normal UBI messages */

void ubi_msg(const struct ubi_device *ubi, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	pr_notice(UBI_NAME_STR "%d: %pV\n", ubi->ubi_num, &vaf);



	va_end(args);

}



/* UBI warning messages */

void ubi_warn(const struct ubi_device *ubi, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	pr_warn(UBI_NAME_STR "%d warning: %ps: %pV\n",

		ubi->ubi_num, __builtin_return_address(0), &vaf);



	va_end(args);

}



/* UBI error messages */

void ubi_err(const struct ubi_device *ubi, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	pr_err(UBI_NAME_STR "%d error: %ps: %pV\n",

	       ubi->ubi_num, __builtin_return_address(0), &vaf);

	va_end(args);

}

drivers/mtd/ubi/ubi.h

+10 −6
Original line number Original line Diff line number Diff line
@@ -49,15 +49,19 @@ 
/* UBI name used for character devices, sysfs, etc */

/* UBI name used for character devices, sysfs, etc */

#define UBI_NAME_STR "ubi"

#define UBI_NAME_STR "ubi"





struct ubi_device;



/* Normal UBI messages */

/* Normal UBI messages */

#define ubi_msg(ubi, fmt, ...) pr_notice(UBI_NAME_STR "%d: " fmt "\n", \

__printf(2, 3)

					 ubi->ubi_num, ##__VA_ARGS__)

void ubi_msg(const struct ubi_device *ubi, const char *fmt, ...);



/* UBI warning messages */

/* UBI warning messages */

#define ubi_warn(ubi, fmt, ...) pr_warn(UBI_NAME_STR "%d warning: %s: " fmt "\n", \

__printf(2, 3)

					ubi->ubi_num, __func__, ##__VA_ARGS__)

void ubi_warn(const struct ubi_device *ubi, const char *fmt, ...);



/* UBI error messages */

/* UBI error messages */

#define ubi_err(ubi, fmt, ...) pr_err(UBI_NAME_STR "%d error: %s: " fmt "\n", \

__printf(2, 3)

				      ubi->ubi_num, __func__, ##__VA_ARGS__)

void ubi_err(const struct ubi_device *ubi, const char *fmt, ...);





/* Background thread name pattern */

/* Background thread name pattern */

#define UBI_BGT_NAME_PATTERN "ubi_bgt%dd"

#define UBI_BGT_NAME_PATTERN "ubi_bgt%dd"

fs/ubifs/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,3 +4,4 @@ ubifs-y += shrinker.o journal.o file.o dir.o super.o sb.o io.o 
ubifs-y += tnc.o master.o scan.o replay.o log.o commit.o gc.o orphan.o

ubifs-y += tnc.o master.o scan.o replay.o log.o commit.o gc.o orphan.o

ubifs-y += budget.o find.o tnc_commit.o compress.o lpt.o lprops.o

ubifs-y += budget.o find.o tnc_commit.o compress.o lpt.o lprops.o

ubifs-y += recovery.o ioctl.o lpt_commit.o tnc_misc.o xattr.o debug.o

ubifs-y += recovery.o ioctl.o lpt_commit.o tnc_misc.o xattr.o debug.o

ubifs-y += misc.o

fs/ubifs/misc.c

0 → 100644
+57 −0
Original line number Original line Diff line number Diff line 
#include <linux/kernel.h>

#include "ubifs.h"



/* Normal UBIFS messages */

void ubifs_msg(const struct ubifs_info *c, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	pr_notice("UBIFS (ubi%d:%d): %pV\n",

		  c->vi.ubi_num, c->vi.vol_id, &vaf);



	va_end(args);

}								    \



/* UBIFS error messages */

void ubifs_err(const struct ubifs_info *c, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	pr_err("UBIFS error (ubi%d:%d pid %d): %ps: %pV\n",

	       c->vi.ubi_num, c->vi.vol_id, current->pid,

	       __builtin_return_address(0),

	       &vaf);



	va_end(args);

}								    \



/* UBIFS warning messages */

void ubifs_warn(const struct ubifs_info *c, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	pr_warn("UBIFS warning (ubi%d:%d pid %d): %ps: %pV\n",

		c->vi.ubi_num, c->vi.vol_id, current->pid,

		__builtin_return_address(0),

		&vaf);



	va_end(args);

}