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 c51638fb82c5ddfb31c5f2d4bf21a6070a02723e..3e59e0bc97885589ff764d3f302f9953b39ddd41 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 18f5980490563f5f5d18492b6fce16d2d11564c0..3dac3739e3844c1fbcb9b7cd2269a4a6e633ad1d 100644 (file)
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -177,9 +177,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;
@@ -238,9 +240,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;
@@ -301,10 +304,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 352dedd80ee8cb57862a4a81da15b24729ce300a..5df4e1cc37d48d8a821d27b5e11a0830c5c02a75 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;