Linus, please do a
bk pull http://linux-ntfs.bkbits.net/ntfs-2.5
Thanks! The 7th, final, changeset in the series. Wraps the i_size changes
trapping code in ifdef NTFS_RW. Forgot to do it in last changeset...
Best regards,
Anton
--
Anton Altaparmakov <aia21 at cantab.net> (replace at with @)
Linux NTFS maintainer / IRC: #ntfs on irc.openprojects.net
WWW: http://linux-ntfs.sf.net/, http://www-stu.christs.cam.ac.uk/~aia21/
===================================================================
This will update the following files:
fs/ntfs/file.c | 2 ++
fs/ntfs/inode.c | 4 ++++
fs/ntfs/inode.h | 4 ++++
3 files changed, 10 insertions(+)
through these ChangeSets:
<[email protected]> (02/08/20 1.486.1.4)
NTFS: Add ifdef NTFS_RW arround ntfs_truncate and ntfs_setattr.
diff -Nru a/fs/ntfs/file.c b/fs/ntfs/file.c
--- a/fs/ntfs/file.c Tue Aug 20 23:58:21 2002
+++ b/fs/ntfs/file.c Tue Aug 20 23:58:21 2002
@@ -64,8 +64,10 @@
};
struct inode_operations ntfs_file_inode_ops = {
+#ifdef NTFS_RW
.truncate = ntfs_truncate,
.setattr = ntfs_setattr,
+#endif
};
struct file_operations ntfs_empty_file_ops = {};
diff -Nru a/fs/ntfs/inode.c b/fs/ntfs/inode.c
--- a/fs/ntfs/inode.c Tue Aug 20 23:58:21 2002
+++ b/fs/ntfs/inode.c Tue Aug 20 23:58:21 2002
@@ -1928,6 +1928,8 @@
return 0;
}
+#ifdef NTFS_RW
+
/**
* ntfs_truncate - called when the i_size of an ntfs inode is changed
* @vi: inode for which the i_size was changed
@@ -2016,4 +2018,6 @@
return err;
}
+
+#endif
diff -Nru a/fs/ntfs/inode.h b/fs/ntfs/inode.h
--- a/fs/ntfs/inode.h Tue Aug 20 23:58:21 2002
+++ b/fs/ntfs/inode.h Tue Aug 20 23:58:21 2002
@@ -245,9 +245,13 @@
extern int ntfs_show_options(struct seq_file *sf, struct vfsmount *mnt);
+#ifdef NTFS_RW
+
extern void ntfs_truncate(struct inode *vi);
extern int ntfs_setattr(struct dentry *dentry, struct iattr *attr);
+
+#endif
#endif /* _LINUX_NTFS_FS_INODE_H */