X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=include%2Flinux%2Ffs.h;h=b2ccd1e7a9d1957f1abfab6f0a84cfc64ec4e3e0;hp=a509bee30c50735771e37f8a6778f6a888393eb4;hb=bffba767ce077770354a1085b070442de1378c31;hpb=55e9df645e8cf3d64d82cc7a76050b5e334718ef

diff --git a/include/linux/fs.h b/include/linux/fs.h
index a509bee30c50..b2ccd1e7a9d1 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1032,7 +1032,11 @@ struct file_handle {
 	unsigned char f_handle[0];
 };
 
-#define get_file(x)	atomic_long_inc(&(x)->f_count)
+static inline struct file *get_file(struct file *f)
+{
+	atomic_long_inc(&f->f_count);
+	return f;
+}
 #define fput_atomic(x)	atomic_long_add_unless(&(x)->f_count, -1, 1)
 #define file_count(x)	atomic_long_read(&(x)->f_count)
 
@@ -2615,7 +2619,7 @@ extern int buffer_migrate_page(struct address_space *,
 #define buffer_migrate_page NULL
 #endif
 
-extern int inode_change_ok(const struct inode *, struct iattr *);
+extern int setattr_prepare(struct dentry *, struct iattr *);
 extern int inode_newsize_ok(const struct inode *, loff_t offset);
 extern void setattr_copy(struct inode *inode, const struct iattr *attr);