diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /fs/ntfs | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/Makefile | 2 | ||||
| -rw-r--r-- | fs/ntfs/fs.c | 6 | ||||
| -rw-r--r-- | fs/ntfs/inode.c | 5 | ||||
| -rw-r--r-- | fs/ntfs/super.c | 1 |
4 files changed, 7 insertions, 7 deletions
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile index 6f0e188d1..9e7ab2eaf 100644 --- a/fs/ntfs/Makefile +++ b/fs/ntfs/Makefile @@ -3,7 +3,7 @@ O_TARGET := ntfs.o O_OBJS := fs.o sysctl.o support.o util.o inode.o dir.o super.o attr.o M_OBJS := $(O_TARGET) -EXTRA_CFLAGS = -DNTFS_IN_LINUX_KERNEL -DNTFS_VERSION=\"000502\" +EXTRA_CFLAGS = -DNTFS_IN_LINUX_KERNEL -DNTFS_VERSION=\"000607\" include $(TOPDIR)/Rules.make diff --git a/fs/ntfs/fs.c b/fs/ntfs/fs.c index 3d58541ad..8ec377e0a 100644 --- a/fs/ntfs/fs.c +++ b/fs/ntfs/fs.c @@ -80,7 +80,7 @@ ntfs_read(struct file * filp, char *buf, size_t count, loff_t *off) io.param=buf; io.size=count; error=ntfs_read_attr(ino,ino->vol->at_data,NULL,*off,&io); - if(error)return -error; + if(error && !io.size)return -error; *off+=io.size; return io.size; @@ -218,7 +218,7 @@ static int ntfs_readdir(struct file* filp, void *dirent, filldir_t filldir) (unsigned)dir->i_ino,(unsigned int)dir->i_mode); ntfs_debug(DEBUG_OTHER, "readdir: Looking for file %x dircount %d\n", - (unsigned)filp->f_pos,dir->i_count); + (unsigned)filp->f_pos,atomic_read(&dir->i_count)); cb.pl=filp->f_pos & 0xFFFF; cb.ph=filp->f_pos >> 16; /* end of directory */ @@ -707,7 +707,7 @@ static void ntfs_read_inode(struct inode* inode) #ifdef CONFIG_NTFS_RW static void -ntfs_write_inode (struct inode *ino) +ntfs_write_inode (struct inode *ino, int unused) { ntfs_debug (DEBUG_LINUX, "ntfs:write inode %x\n", ino->i_ino); ntfs_update_inode (NTFS_LINO2NINO (ino)); diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index bd8aa6b98..910ffe095 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c @@ -6,6 +6,7 @@ * Copyright (C) 1996-1997 Régis Duchesne * Copyright (C) 1998 Joseph Malicki * Copyright (C) 1999 Steve Dodd + * Copyright (C) 2000 Anton Altaparmakov */ #include "ntfstypes.h" @@ -551,11 +552,11 @@ int ntfs_readwrite_attr(ntfs_inode *ino, ntfs_attribute *attr, int offset, dest->size=chunk; error=ntfs_getput_clusters(ino->vol,s_cluster, offset-s_vcn*clustersize,dest); - if(error)/* FIXME: maybe return failure */ + if(error) { ntfs_error("Read error\n"); dest->size=copied; - return 0; + return error; } l-=chunk; copied+=chunk; diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 7f2a7fe86..3b7b5b2af 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -221,7 +221,6 @@ ntfs_init_attrdef(ntfs_inode* attrdef) int ntfs_get_version(ntfs_inode* volume) { ntfs_attribute *volinfo; - int i; volinfo = ntfs_find_attr(volume, volume->vol->at_volume_information, 0); if (!volinfo) |