Commit 12e807ea authored by Anton Altaparmakov's avatar Anton Altaparmakov

NTFS: Minor cleanups, contact details updates, remove superfluous

set_blocksize.
parent fc5d32d7
...@@ -63,10 +63,9 @@ S: B-2610 Wilrijk-Antwerpen ...@@ -63,10 +63,9 @@ S: B-2610 Wilrijk-Antwerpen
S: Belgium S: Belgium
N: Anton Altaparmakov N: Anton Altaparmakov
E: aia21@cus.cam.ac.uk E: aia21@cantab.net
W: http://www-stu.christs.cam.ac.uk/~aia21/ W: http://www-stu.christs.cam.ac.uk/~aia21/
D: NTFS driver maintainer. NTFS fixes and cleanup. D: Author of new NTFS driver, various other kernel hacks.
D: Tiny fixes in linear md device and emu10k1 driver.
S: Christ's College S: Christ's College
S: Cambridge CB2 3BU S: Cambridge CB2 3BU
S: United Kingdom S: United Kingdom
......
...@@ -1146,9 +1146,10 @@ S: Maintained ...@@ -1146,9 +1146,10 @@ S: Maintained
NTFS FILESYSTEM NTFS FILESYSTEM
P: Anton Altaparmakov P: Anton Altaparmakov
M: aia21@cus.cam.ac.uk M: aia21@cantab.net
L: linux-ntfs-dev@lists.sourceforge.net L: linux-ntfs-dev@lists.sourceforge.net
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
W: http://linux-ntfs.sf.net/
S: Maintained S: Maintained
NVIDIA (RIVA) FRAMEBUFFER DRIVER NVIDIA (RIVA) FRAMEBUFFER DRIVER
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
* "Samuel Hocevar" <sam@via.ecp.fr> * "Samuel Hocevar" <sam@via.ecp.fr>
* Fixes * Fixes
* *
* "Anton Altaparmakov" <AntonA@bigfoot.com> * "Anton Altaparmakov"
* G400 MAX/non-MAX distinction * G400 MAX/non-MAX distinction
* *
* "Ken Aaker" <kdaaker@rchland.vnet.ibm.com> * "Ken Aaker" <kdaaker@rchland.vnet.ibm.com>
......
...@@ -1191,7 +1191,8 @@ void ntfs_read_inode_mount(struct inode *vi) ...@@ -1191,7 +1191,8 @@ void ntfs_read_inode_mount(struct inode *vi)
"for $MFT/$DATA. Driver bug or " "for $MFT/$DATA. Driver bug or "
"corrupt $MFT. Run chkdsk."); "corrupt $MFT. Run chkdsk.");
ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx", ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx",
(long long)highest_vcn, (long long)last_vcn - 1); (long long)highest_vcn,
(long long)last_vcn - 1);
goto put_err_out; goto put_err_out;
} }
put_attr_search_ctx(ctx); put_attr_search_ctx(ctx);
......
...@@ -1555,7 +1555,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) ...@@ -1555,7 +1555,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
if (sb_set_blocksize(sb, NTFS_BLOCK_SIZE) != NTFS_BLOCK_SIZE) { if (sb_set_blocksize(sb, NTFS_BLOCK_SIZE) != NTFS_BLOCK_SIZE) {
if (!silent) if (!silent)
ntfs_error(sb, "Unable to set block size."); ntfs_error(sb, "Unable to set block size.");
goto set_blk_size_err_out_now; goto err_out_now;
} }
/* Get the size of the device in units of NTFS_BLOCK_SIZE bytes. */ /* Get the size of the device in units of NTFS_BLOCK_SIZE bytes. */
...@@ -1565,7 +1565,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) ...@@ -1565,7 +1565,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
if (!(bh = read_ntfs_boot_sector(sb, silent))) { if (!(bh = read_ntfs_boot_sector(sb, silent))) {
if (!silent) if (!silent)
ntfs_error(sb, "Not an NTFS volume."); ntfs_error(sb, "Not an NTFS volume.");
goto set_blk_size_err_out_now; goto err_out_now;
} }
/* /*
...@@ -1579,7 +1579,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) ...@@ -1579,7 +1579,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
if (!result) { if (!result) {
if (!silent) if (!silent)
ntfs_error(sb, "Unsupported NTFS filesystem."); ntfs_error(sb, "Unsupported NTFS filesystem.");
goto set_blk_size_err_out_now; goto err_out_now;
} }
/* /*
...@@ -1750,10 +1750,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent) ...@@ -1750,10 +1750,7 @@ static int ntfs_fill_super(struct super_block *sb, void *opt, const int silent)
printk("VFS: Busy inodes after umount. Self-destruct in 5 " printk("VFS: Busy inodes after umount. Self-destruct in 5 "
"seconds. Have a nice day...\n"); "seconds. Have a nice day...\n");
} }
set_blk_size_err_out_now:
/* Errors at this stage are irrelevant. */ /* Errors at this stage are irrelevant. */
// FIXME: This should be done in fs/super.c::get_sb_bdev() itself! (AIA)
sb_set_blocksize(sb, sb->s_old_blocksize);
err_out_now: err_out_now:
sb->u.generic_sbp = NULL; sb->u.generic_sbp = NULL;
kfree(vol); kfree(vol);
...@@ -1936,7 +1933,7 @@ static void __exit exit_ntfs_fs(void) ...@@ -1936,7 +1933,7 @@ static void __exit exit_ntfs_fs(void)
} }
EXPORT_NO_SYMBOLS; EXPORT_NO_SYMBOLS;
MODULE_AUTHOR("Anton Altaparmakov <aia21@cam.ac.uk>"); MODULE_AUTHOR("Anton Altaparmakov <aia21@cantab.net>");
MODULE_DESCRIPTION("NTFS 1.2/3.x driver"); MODULE_DESCRIPTION("NTFS 1.2/3.x driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#ifdef DEBUG #ifdef DEBUG
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Part of the Linux-NTFS project. * Part of the Linux-NTFS project.
* *
* Copyright (C) 2001 Richard Russon <ntfs@flatcap.org> * Copyright (C) 2001 Richard Russon <ntfs@flatcap.org>
* Copyright (c) 2001 Anton Altaparmakov <aia21@cam.ac.uk> * Copyright (c) 2001,2002 Anton Altaparmakov
* *
* Modified for mkntfs inclusion 9 June 2001 by Anton Altaparmakov. * Modified for mkntfs inclusion 9 June 2001 by Anton Altaparmakov.
* Modified for kernel inclusion 10 September 2001 by Anton Altparmakov. * Modified for kernel inclusion 10 September 2001 by Anton Altparmakov.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ldm - Part of the Linux-NTFS project. * ldm - Part of the Linux-NTFS project.
* *
* Copyright (C) 2001 Richard Russon <ldm@flatcap.org> * Copyright (C) 2001 Richard Russon <ldm@flatcap.org>
* Copyright (C) 2001 Anton Altaparmakov <antona@users.sf.net> (AIA) * Copyright (C) 2001 Anton Altaparmakov (AIA)
* *
* Documentation is available at http://linux-ntfs.sf.net/ldm * Documentation is available at http://linux-ntfs.sf.net/ldm
* *
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* ldm - Part of the Linux-NTFS project. * ldm - Part of the Linux-NTFS project.
* *
* Copyright (C) 2001 Richard Russon <ldm@flatcap.org> * Copyright (C) 2001 Richard Russon <ldm@flatcap.org>
* Copyright (C) 2001 Anton Altaparmakov <antona@users.sf.net> * Copyright (C) 2001 Anton Altaparmakov
* *
* Documentation is available at http://linux-ntfs.sf.net/ldm * Documentation is available at http://linux-ntfs.sf.net/ldm
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment