summaryrefslogtreecommitdiffstats
path: root/fs/hfs/file_hdr.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
commit116674acc97ba75a720329996877077d988443a2 (patch)
tree6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /fs/hfs/file_hdr.c
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/hfs/file_hdr.c')
-rw-r--r--fs/hfs/file_hdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hfs/file_hdr.c b/fs/hfs/file_hdr.c
index ba62615b0..c22f71611 100644
--- a/fs/hfs/file_hdr.c
+++ b/fs/hfs/file_hdr.c
@@ -2,7 +2,7 @@
* linux/fs/hfs/file_hdr.c
*
* Copyright (C) 1995-1997 Paul H. Hargrove
- * This file may be distributed under the terms of the GNU Public License.
+ * This file may be distributed under the terms of the GNU General Public License.
*
* This file contains the file_ops and inode_ops for the metadata
* files under the AppleDouble and Netatalk representations.
@@ -348,9 +348,9 @@ static void set_dates(struct hfs_cat_entry *entry, struct inode *inode,
* This is the read field in the inode_operations structure for
* header files. The purpose is to transfer up to 'count' bytes
* from the file corresponding to 'inode', beginning at
- * 'filp->offset' bytes into the file. The data is transfered to
+ * 'filp->offset' bytes into the file. The data is transferred to
* user-space at the address 'buf'. Returns the number of bytes
- * successfully transfered.
+ * successfully transferred.
*/
/* XXX: what about the entry count changing on us? */
static hfs_rwret_t hdr_read(struct file * filp, char * buf,