From 1f4315cc50c35ae652d301b8ae87ad972e1b46f2 Mon Sep 17 00:00:00 2001
From: Matt Mackall <mpm@selenic.com>
Date: Sun, 8 Jan 2006 01:05:20 -0800
Subject: [PATCH] --- yaml --- r: 17043 b: refs/heads/master c:
 b01ec0ef63e95570e2463b26333d9c9c854cb941 h: refs/heads/master i:   17041:
 f23aeba134e76f9423447b480cdfeec541832ef0   17039:
 3a17548b25641096e2c1f15009c96bf3cae7f83b v: v3

---
 [refs]          | 2 +-
 trunk/fs/open.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e1c39111e45b..61a5eb9551e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d960600df3ce3588571e2c1adf1f5f6d8ca9eb5a
+refs/heads/master: b01ec0ef63e95570e2463b26333d9c9c854cb941
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index 94968cb3afca..75f3329e8a67 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -217,7 +217,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
 	return err;
 }
 
-static inline long do_sys_truncate(const char __user * path, loff_t length)
+static long do_sys_truncate(const char __user * path, loff_t length)
 {
 	struct nameidata nd;
 	struct inode * inode;
@@ -283,7 +283,7 @@ asmlinkage long sys_truncate(const char __user * path, unsigned long length)
 	return do_sys_truncate(path, (long)length);
 }
 
-static inline long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
+static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
 {
 	struct inode * inode;
 	struct dentry *dentry;
@@ -971,7 +971,7 @@ int get_unused_fd(void)
 
 EXPORT_SYMBOL(get_unused_fd);
 
-static inline void __put_unused_fd(struct files_struct *files, unsigned int fd)
+static void __put_unused_fd(struct files_struct *files, unsigned int fd)
 {
 	struct fdtable *fdt = files_fdtable(files);
 	__FD_CLR(fd, fdt->open_fds);