aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMister Oyster <oysterized@gmail.com>2017-04-11 19:34:22 +0200
committerMister Oyster <oysterized@gmail.com>2017-04-16 15:03:43 +0200
commitb4dd6a3a7ac317146c73b03118f8721c48e6eb5b (patch)
tree655bbeef08d0b1b5006c9aeee9dbf24ea9d450d3 /fs
parentba697295b35131a9d44d9aae16bb93cc8fb295ee (diff)
sdcardfs: indentation
Diffstat (limited to 'fs')
-rwxr-xr-xfs/sdcardfs/inode.c1
-rwxr-xr-xfs/sdcardfs/lookup.c3
-rwxr-xr-xfs/sdcardfs/packagelist.c4
-rwxr-xr-xfs/sdcardfs/sdcardfs.h16
4 files changed, 16 insertions, 8 deletions
diff --git a/fs/sdcardfs/inode.c b/fs/sdcardfs/inode.c
index 71694c0e9..365d2871a 100755
--- a/fs/sdcardfs/inode.c
+++ b/fs/sdcardfs/inode.c
@@ -594,6 +594,7 @@ static void sdcardfs_put_link(struct dentry *dentry, struct nameidata *nd,
void *cookie)
{
char *buf = nd_get_link(nd);
+
if (!IS_ERR(buf)) /* free the char* */
kfree(buf);
}
diff --git a/fs/sdcardfs/lookup.c b/fs/sdcardfs/lookup.c
index 6e1a17505..f36958bac 100755
--- a/fs/sdcardfs/lookup.c
+++ b/fs/sdcardfs/lookup.c
@@ -114,7 +114,8 @@ struct inode *sdcardfs_iget(struct super_block *sb, struct inode *lower_inode, u
if (!(inode->i_state & I_NEW)) {
/* There can only be one alias, as we don't permit hard links
* This ensures we do not keep stale dentries that would later
- * cause confusion. */
+ * cause confusion.
+ */
d_prune_aliases(inode);
return inode;
}
diff --git a/fs/sdcardfs/packagelist.c b/fs/sdcardfs/packagelist.c
index 27205cdb8..0616cbd37 100755
--- a/fs/sdcardfs/packagelist.c
+++ b/fs/sdcardfs/packagelist.c
@@ -351,6 +351,7 @@ static void remove_packagelist_entry_locked(const struct qstr *key)
struct hashtable_entry *hash_cur;
unsigned int hash = key->hash;
struct hlist_node *h_t;
+
HLIST_HEAD(free_list);
hash_for_each_possible_rcu(package_to_userid, hash_cur, hlist, hash) {
@@ -404,7 +405,9 @@ static void remove_ext_gid_entry(const struct qstr *key, gid_t group)
static void remove_userid_all_entry_locked(userid_t userid)
{
struct hashtable_entry *hash_cur;
+
struct hlist_node *h_t;
+
HLIST_HEAD(free_list);
int i;
@@ -456,6 +459,7 @@ static void packagelist_destroy(void)
{
struct hashtable_entry *hash_cur;
struct hlist_node *h_t;
+
HLIST_HEAD(free_list);
int i;
diff --git a/fs/sdcardfs/sdcardfs.h b/fs/sdcardfs/sdcardfs.h
index 4d0999fd7..d6a062573 100755
--- a/fs/sdcardfs/sdcardfs.h
+++ b/fs/sdcardfs/sdcardfs.h
@@ -409,15 +409,17 @@ static inline int get_mode(struct vfsmount *mnt, struct sdcardfs_inode_info *inf
if (info->perm == PERM_PRE_ROOT) {
- /* Top of multi-user view should always be visible to ensure
- * secondary users can traverse inside.
- */
+ /*
+ * Top of multi-user view should always be visible to ensure
+ * secondary users can traverse inside.
+ */
visible_mode = 0711;
} else if (info->under_android) {
- /* Block "other" access to Android directories, since only apps
- * belonging to a specific user should be in there; we still
- * leave +x open for the default view.
- */
+ /*
+ * Block "other" access to Android directories, since only apps
+ * belonging to a specific user should be in there; we still
+ * leave +x open for the default view.
+ */
if (opts->gid == AID_SDCARD_RW)
visible_mode = visible_mode & ~0006;
else