Unionfs: use noinline_for_stack

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 66cf63466a1ec21152ec47f653cce267c2a459f3..5abeb1e1b2f7acaded2e32de325a52757456b808 100644 (file)
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -32,7 +32,7 @@ static int is_validname(const char *name)
 }
 
 /* The rest of these are utility functions for lookup. */
-static noinline int is_opaque_dir(struct dentry *dentry, int bindex)
+static noinline_for_stack int is_opaque_dir(struct dentry *dentry, int bindex)
 {
        int err = 0;
        struct dentry *lower_dentry;

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 9b350be1c21041a65b027b32b7bb6a6167a75a54..80c72e437748768824042761e048cca1a0b9519f 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -179,9 +179,11 @@ out:
 }
 
 /* handle mode changing during remount */
-static noinline int do_remount_mode_option(char *optarg, int cur_branches,
-                                          struct unionfs_data *new_data,
-                                          struct path *new_lower_paths)
+static noinline_for_stack int do_remount_mode_option(
+                                       char *optarg,
+                                       int cur_branches,
+                                       struct unionfs_data *new_data,
+                                       struct path *new_lower_paths)
 {
        int err = -EINVAL;
        int perms, idx;
@@ -240,9 +242,10 @@ out:
 }
 
 /* handle branch deletion during remount */
-static noinline int do_remount_del_option(char *optarg, int cur_branches,
-                                         struct unionfs_data *new_data,
-                                         struct path *new_lower_paths)
+static noinline_for_stack int do_remount_del_option(
+                                       char *optarg, int cur_branches,
+                                       struct unionfs_data *new_data,
+                                       struct path *new_lower_paths)
 {
        int err = -EINVAL;
        int idx;
@@ -303,10 +306,11 @@ out:
 }
 
 /* handle branch insertion during remount */
-static noinline int do_remount_add_option(char *optarg, int cur_branches,
-                                         struct unionfs_data *new_data,
-                                         struct path *new_lower_paths,
-                                         int *high_branch_id)
+static noinline_for_stack int do_remount_add_option(
+                                       char *optarg, int cur_branches,
+                                       struct unionfs_data *new_data,
+                                       struct path *new_lower_paths,
+                                       int *high_branch_id)
 {
        int err = -EINVAL;
        int perms;

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index aecc1f5d240a6706cd6d8a914584914e6f5b4bbc..4beba119a310de5b7cc232ab163316f66fbe7784 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -86,6 +86,10 @@ extern struct address_space_operations unionfs_aops;
 # define unionfs_rw_semaphore  rw_semaphore
 #endif /* not CONFIG_PREEMPT_RT */
 
+#ifndef noinline_for_stack
+# define noinline_for_stack noinline
+#endif /* not noinline_for_stack */
+
 /* file private data. */
 struct unionfs_file_info {
        int bstart;