ANDROID: sdcardfs: remove dead function open_flags_to_access_mode()

smatch warns about the suspicious formatting in the last line of
open_flags_to_access_mode().  It turns out the only caller was deleted
over a year ago by "ANDROID: sdcardfs: Bring up to date with Android M
permissions:", so we can "fix" the function's formatting by deleting it.

Change-Id: Id85946f3eb01722eef35b1815f405a6fda3aa4ff
Signed-off-by: Greg Hackmann <ghackmann@google.com>

diff --git a/fs/sdcardfs/packagelist.c b/fs/sdcardfs/packagelist.c
index f120bcc5bdede9e708c849700a8442b657c9f091..886d2f699b8042ccf3129f5637255cd274445829 100644 (file)
--- a/fs/sdcardfs/packagelist.c
+++ b/fs/sdcardfs/packagelist.c
@@ -175,19 +175,6 @@ int check_caller_access_to_name(struct inode *parent_node, const struct qstr *na
        return 1;
 }
 
-/* This function is used when file opening. The open flags must be
- * checked before calling check_caller_access_to_name()
- */
-int open_flags_to_access_mode(int open_flags)
-{
-       if ((open_flags & O_ACCMODE) == O_RDONLY)
-               return 0; /* R_OK */
-       if ((open_flags & O_ACCMODE) == O_WRONLY)
-               return 1; /* W_OK */
-       /* Probably O_RDRW, but treat as default to be safe */
-               return 1; /* R_OK | W_OK */
-}
-
 static struct hashtable_entry *alloc_hashtable_entry(const struct qstr *key,
                appid_t value)
 {

diff --git a/fs/sdcardfs/sdcardfs.h b/fs/sdcardfs/sdcardfs.h
index 07975a19cf436e5a3bf42434655651dce422905b..63c3bd329105b65da2e5072b9652057f6916b9c2 100644 (file)
--- a/fs/sdcardfs/sdcardfs.h
+++ b/fs/sdcardfs/sdcardfs.h
@@ -498,7 +498,6 @@ extern appid_t get_appid(const char *app_name);
 extern appid_t get_ext_gid(const char *app_name);
 extern appid_t is_excluded(const char *app_name, userid_t userid);
 extern int check_caller_access_to_name(struct inode *parent_node, const struct qstr *name);
-extern int open_flags_to_access_mode(int open_flags);
 extern int packagelist_init(void);
 extern void packagelist_exit(void);