Update of /cvsroot/linux-vax/kernel-2.4/fs/adfs
In directory usw-pr-cvs1:/tmp/cvs-serv24187/adfs
Modified Files:
file.c inode.c map.c super.c
Log Message:
synch 2.4.15 commit 6
Index: file.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/adfs/file.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- file.c 14 Jan 2001 16:38:37 -0000 1.1.1.1
+++ file.c 9 Apr 2002 12:57:25 -0000 1.2
@@ -29,6 +29,7 @@
#include "adfs.h"
struct file_operations adfs_file_operations = {
+ llseek: generic_file_llseek,
read: generic_file_read,
mmap: generic_file_mmap,
fsync: file_fsync,
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/adfs/inode.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- inode.c 14 Jan 2001 16:38:36 -0000 1.1.1.1
+++ inode.c 9 Apr 2002 12:57:25 -0000 1.2
@@ -17,6 +17,8 @@
#include <linux/locks.h>
#include <linux/mm.h>
#include <linux/smp_lock.h>
+#include <linux/module.h>
+
#include "adfs.h"
@@ -220,7 +222,7 @@
if (inode->u.adfs_i.stamped) {
/* convert 32-bit seconds to 40-bit centi-seconds */
low = (secs & 255) * 100;
- high = (secs / 256) * 100 + (low << 8) + 0x336e996a;
+ high = (secs / 256) * 100 + (low >> 8) + 0x336e996a;
inode->u.adfs_i.loadaddr = (high >> 24) |
(inode->u.adfs_i.loadaddr & ~0xff);
@@ -319,7 +321,11 @@
goto out;
if (ia_valid & ATTR_SIZE)
- vmtruncate(inode, attr->ia_size);
+ error = vmtruncate(inode, attr->ia_size);
+
+ if (error)
+ goto out;
+
if (ia_valid & ATTR_MTIME) {
inode->i_mtime = attr->ia_mtime;
adfs_unix2adfs_time(inode, attr->ia_mtime);
@@ -369,3 +375,4 @@
adfs_dir_update(sb, &obj);
unlock_kernel();
}
+MODULE_LICENSE("GPL");
Index: map.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/adfs/map.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- map.c 14 Jan 2001 16:38:39 -0000 1.1.1.1
+++ map.c 9 Apr 2002 12:57:25 -0000 1.2
@@ -20,6 +20,18 @@
*/
static rwlock_t adfs_map_lock;
+#define GET_FRAG_ID(_map,_start,_idmask) \
+ ({ \
+ unsigned long _v2, _frag; \
+ unsigned int _tmp; \
+ _tmp = _start >> 5; \
+ _frag = le32_to_cpu(_map[_tmp]); \
+ _v2 = le32_to_cpu(_map[_tmp + 1]); \
+ _tmp = start & 31; \
+ _frag = (_frag >> _tmp) | (_v2 << (32 - _tmp)); \
+ _frag & _idmask; \
+ })
+
/*
* return the map bit offset of the fragment frag_id in
* the zone dm.
@@ -40,25 +52,7 @@
do {
unsigned long frag;
- /*
- * get fragment id
- */
- {
- unsigned long v2;
- unsigned int tmp;
-
- tmp = start >> 5;
-
- frag = le32_to_cpu(map[tmp]);
- v2 = le32_to_cpu(map[tmp + 1]);
-
- tmp = start & 31;
-
- frag = (frag >> tmp) | (v2 << (32 - tmp));
-
- frag &= idmask;
- }
-
+ frag = GET_FRAG_ID(map, start, idmask);
mapptr = start + idlen;
/*
@@ -117,21 +111,7 @@
/*
* get fragment id
*/
- {
- unsigned long v2;
- unsigned int tmp;
-
- tmp = start >> 5;
-
- frag = le32_to_cpu(map[tmp]);
- v2 = le32_to_cpu(map[tmp + 1]);
-
- tmp = start & 31;
-
- frag = (frag >> tmp) | (v2 << (32 - tmp));
-
- frag &= idmask;
- }
+ frag = GET_FRAG_ID(map, start, idmask);
/*
* If the freelink is null, then no free fragments
@@ -146,22 +126,7 @@
/*
* get fragment id
*/
- {
- unsigned long v2;
- unsigned int tmp;
-
- tmp = start >> 5;
-
- frag = le32_to_cpu(map[tmp]);
- v2 = le32_to_cpu(map[tmp + 1]);
-
- tmp = start & 31;
-
- frag = (frag >> tmp) | (v2 << (32 - tmp));
-
- frag &= idmask;
- }
-
+ frag = GET_FRAG_ID(map, start, idmask);
mapptr = start + idlen;
/*
Index: super.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/fs/adfs/super.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- super.c 25 Feb 2001 23:14:48 -0000 1.1.1.2
+++ super.c 9 Apr 2002 12:57:25 -0000 1.2
@@ -39,7 +39,7 @@
va_end(args);
printk(KERN_CRIT "ADFS-fs error (device %s)%s%s: %s\n",
- kdevname(sb->s_dev), function ? ": " : "",
+ bdevname(sb->s_dev), function ? ": " : "",
function ? function : "", error_buf);
}
@@ -330,7 +330,7 @@
if (adfs_checkbblk(b_data)) {
if (!silent)
printk("VFS: Can't find an adfs filesystem on dev "
- "%s.\n", kdevname(dev));
+ "%s.\n", bdevname(dev));
goto error_free_bh;
}
@@ -342,7 +342,7 @@
if (adfs_checkdiscrecord(dr)) {
if (!silent)
printk("VPS: Can't find an adfs filesystem on dev "
- "%s.\n", kdevname(dev));
+ "%s.\n", bdevname(dev));
goto error_free_bh;
}
@@ -370,7 +370,7 @@
if (sb->s_blocksize != bh->b_size) {
if (!silent)
printk(KERN_ERR "VFS: Unsupported blocksize on dev "
- "%s.\n", kdevname(dev));
+ "%s.\n", bdevname(dev));
goto error_free_bh;
}
@@ -385,7 +385,7 @@
sb->u.adfs_sb.s_size = adfs_discsize(dr, sb->s_blocksize_bits);
sb->u.adfs_sb.s_version = dr->format_version;
sb->u.adfs_sb.s_log2sharesize = dr->log2sharesize;
-
+
sb->u.adfs_sb.s_map = adfs_read_map(sb, dr);
if (!sb->u.adfs_sb.s_map)
goto error_free_bh;
|
