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 7618716cf0ad04ef3e7e22dc98d8b143c08e02e4..7f512c2a56408015539bb5b0ec40f436711a41f6 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 0a16c61bfd5e139df9d3d4de646630bef35f0c69..a9fdf223e3ef3e4ab8880d04b2224c5522f252b4 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 ce6c2102aba5612c561b6ced43091ad33aaa86ca..16f467d5e4f5d4f163b099bd67e6a140ce6ea786 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -88,6 +88,10 @@ extern struct vm_operations_struct unionfs_vm_ops;
 # 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;