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

Commit 8050490f authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

ANDROID: sdcardfs: Fix style issues in macros 



Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
Bug: 35331000
Change-Id: I89c4035029dc2236081a7685c55cac595d9e7ebf
parent 30403839

fs/sdcardfs/packagelist.c

+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static inline struct package_details *to_package_details(struct config_item *ite 
CONFIGFS_ATTR_STRUCT(package_details);

#define PACKAGE_DETAILS_ATTR(_name, _mode, _show, _store)	\

struct package_details_attribute package_details_attr_##_name = __CONFIGFS_ATTR(_name, _mode, _show, _store)

#define PACKAGE_DETAILS_ATTRIBUTE(name) &package_details_attr_##name.attr

#define PACKAGE_DETAILS_ATTRIBUTE(name) (&package_details_attr_##name.attr)



static ssize_t package_details_appid_show(struct package_details *package_details,

				      char *page)
@@ -738,7 +738,7 @@ CONFIGFS_ATTR_STRUCT(packages); 
#define PACKAGES_ATTR(_name, _mode, _show, _store)	\

struct packages_attribute packages_attr_##_name = __CONFIGFS_ATTR(_name, _mode, _show, _store)

#define PACKAGES_ATTR_RO(_name, _show)	\

struct packages_attribute packages_attr_##_name = __CONFIGFS_ATTR_RO(_name, _show);

struct packages_attribute packages_attr_##_name = __CONFIGFS_ATTR_RO(_name, _show)



static struct config_item *packages_make_item(struct config_group *group, const char *name)

{

fs/sdcardfs/sdcardfs.h

+10 −10
Original line number Diff line number Diff line
@@ -96,21 +96,21 @@ 
 * placed at the beginning of a function, right after variable declaration.

 */

#define OVERRIDE_CRED(sdcardfs_sbi, saved_cred, info)		\

	do {	\

		saved_cred = override_fsids(sdcardfs_sbi, info);	\

	if (!saved_cred) { return -ENOMEM; }

		if (!saved_cred)	\

			return -ENOMEM;	\

	} while (0)



#define OVERRIDE_CRED_PTR(sdcardfs_sbi, saved_cred, info)	\

	do {	\

		saved_cred = override_fsids(sdcardfs_sbi, info);	\

	if (!saved_cred) { return ERR_PTR(-ENOMEM); }

		if (!saved_cred)	\

			return ERR_PTR(-ENOMEM);	\

	} while (0)



#define REVERT_CRED(saved_cred)	revert_fsids(saved_cred)



#define DEBUG_CRED()		\

	printk("KAKJAGI: %s:%d fsuid %d fsgid %d\n", 	\

		__FUNCTION__, __LINE__, 		\

		(int)current->cred->fsuid, 		\

		(int)current->cred->fsgid);



/* Android 5.0 support */



/* Permission mode for a specific node. Controls how file permissions