diff options
-rw-r--r-- | fs/namespace.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 9f6005e55862..f527a0d6c64d 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -1425,9 +1425,8 @@ out_unlock: | |||
1425 | 1425 | ||
1426 | /* | 1426 | /* |
1427 | * recursively change the type of the mountpoint. | 1427 | * recursively change the type of the mountpoint. |
1428 | * noinline this do_mount helper to save do_mount stack space. | ||
1429 | */ | 1428 | */ |
1430 | static noinline int do_change_type(struct path *path, int flag) | 1429 | static int do_change_type(struct path *path, int flag) |
1431 | { | 1430 | { |
1432 | struct vfsmount *m, *mnt = path->mnt; | 1431 | struct vfsmount *m, *mnt = path->mnt; |
1433 | int recurse = flag & MS_REC; | 1432 | int recurse = flag & MS_REC; |
@@ -1459,9 +1458,8 @@ static noinline int do_change_type(struct path *path, int flag) | |||
1459 | 1458 | ||
1460 | /* | 1459 | /* |
1461 | * do loopback mount. | 1460 | * do loopback mount. |
1462 | * noinline this do_mount helper to save do_mount stack space. | ||
1463 | */ | 1461 | */ |
1464 | static noinline int do_loopback(struct path *path, char *old_name, | 1462 | static int do_loopback(struct path *path, char *old_name, |
1465 | int recurse) | 1463 | int recurse) |
1466 | { | 1464 | { |
1467 | struct path old_path; | 1465 | struct path old_path; |
@@ -1528,9 +1526,8 @@ static int change_mount_flags(struct vfsmount *mnt, int ms_flags) | |||
1528 | * change filesystem flags. dir should be a physical root of filesystem. | 1526 | * change filesystem flags. dir should be a physical root of filesystem. |
1529 | * If you've mounted a non-root directory somewhere and want to do remount | 1527 | * If you've mounted a non-root directory somewhere and want to do remount |
1530 | * on it - tough luck. | 1528 | * on it - tough luck. |
1531 | * noinline this do_mount helper to save do_mount stack space. | ||
1532 | */ | 1529 | */ |
1533 | static noinline int do_remount(struct path *path, int flags, int mnt_flags, | 1530 | static int do_remount(struct path *path, int flags, int mnt_flags, |
1534 | void *data) | 1531 | void *data) |
1535 | { | 1532 | { |
1536 | int err; | 1533 | int err; |
@@ -1568,10 +1565,7 @@ static inline int tree_contains_unbindable(struct vfsmount *mnt) | |||
1568 | return 0; | 1565 | return 0; |
1569 | } | 1566 | } |
1570 | 1567 | ||
1571 | /* | 1568 | static int do_move_mount(struct path *path, char *old_name) |
1572 | * noinline this do_mount helper to save do_mount stack space. | ||
1573 | */ | ||
1574 | static noinline int do_move_mount(struct path *path, char *old_name) | ||
1575 | { | 1569 | { |
1576 | struct path old_path, parent_path; | 1570 | struct path old_path, parent_path; |
1577 | struct vfsmount *p; | 1571 | struct vfsmount *p; |
@@ -1648,9 +1642,8 @@ out: | |||
1648 | /* | 1642 | /* |
1649 | * create a new mount for userspace and request it to be added into the | 1643 | * create a new mount for userspace and request it to be added into the |
1650 | * namespace's tree | 1644 | * namespace's tree |
1651 | * noinline this do_mount helper to save do_mount stack space. | ||
1652 | */ | 1645 | */ |
1653 | static noinline int do_new_mount(struct path *path, char *type, int flags, | 1646 | static int do_new_mount(struct path *path, char *type, int flags, |
1654 | int mnt_flags, char *name, void *data) | 1647 | int mnt_flags, char *name, void *data) |
1655 | { | 1648 | { |
1656 | struct vfsmount *mnt; | 1649 | struct vfsmount *mnt; |