diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/befs/linuxvfs.c | 38 | ||||
-rw-r--r-- | fs/cifs/file.c | 2 | ||||
-rw-r--r-- | fs/jfs/jfs_txnmgr.c | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index a83e889a97cd..fcaeead9696b 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
@@ -325,7 +325,7 @@ befs_read_inode(struct inode *inode) | |||
325 | if (!bh) { | 325 | if (!bh) { |
326 | befs_error(sb, "unable to read inode block - " | 326 | befs_error(sb, "unable to read inode block - " |
327 | "inode = %lu", inode->i_ino); | 327 | "inode = %lu", inode->i_ino); |
328 | goto unaquire_none; | 328 | goto unacquire_none; |
329 | } | 329 | } |
330 | 330 | ||
331 | raw_inode = (befs_inode *) bh->b_data; | 331 | raw_inode = (befs_inode *) bh->b_data; |
@@ -334,7 +334,7 @@ befs_read_inode(struct inode *inode) | |||
334 | 334 | ||
335 | if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { | 335 | if (befs_check_inode(sb, raw_inode, inode->i_ino) != BEFS_OK) { |
336 | befs_error(sb, "Bad inode: %lu", inode->i_ino); | 336 | befs_error(sb, "Bad inode: %lu", inode->i_ino); |
337 | goto unaquire_bh; | 337 | goto unacquire_bh; |
338 | } | 338 | } |
339 | 339 | ||
340 | inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); | 340 | inode->i_mode = (umode_t) fs32_to_cpu(sb, raw_inode->mode); |
@@ -402,17 +402,17 @@ befs_read_inode(struct inode *inode) | |||
402 | befs_error(sb, "Inode %lu is not a regular file, " | 402 | befs_error(sb, "Inode %lu is not a regular file, " |
403 | "directory or symlink. THAT IS WRONG! BeFS has no " | 403 | "directory or symlink. THAT IS WRONG! BeFS has no " |
404 | "on disk special files", inode->i_ino); | 404 | "on disk special files", inode->i_ino); |
405 | goto unaquire_bh; | 405 | goto unacquire_bh; |
406 | } | 406 | } |
407 | 407 | ||
408 | brelse(bh); | 408 | brelse(bh); |
409 | befs_debug(sb, "<--- befs_read_inode()"); | 409 | befs_debug(sb, "<--- befs_read_inode()"); |
410 | return; | 410 | return; |
411 | 411 | ||
412 | unaquire_bh: | 412 | unacquire_bh: |
413 | brelse(bh); | 413 | brelse(bh); |
414 | 414 | ||
415 | unaquire_none: | 415 | unacquire_none: |
416 | make_bad_inode(inode); | 416 | make_bad_inode(inode); |
417 | befs_debug(sb, "<--- befs_read_inode() - Bad inode"); | 417 | befs_debug(sb, "<--- befs_read_inode() - Bad inode"); |
418 | return; | 418 | return; |
@@ -761,14 +761,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
761 | printk(KERN_ERR | 761 | printk(KERN_ERR |
762 | "BeFS(%s): Unable to allocate memory for private " | 762 | "BeFS(%s): Unable to allocate memory for private " |
763 | "portion of superblock. Bailing.\n", sb->s_id); | 763 | "portion of superblock. Bailing.\n", sb->s_id); |
764 | goto unaquire_none; | 764 | goto unacquire_none; |
765 | } | 765 | } |
766 | befs_sb = BEFS_SB(sb); | 766 | befs_sb = BEFS_SB(sb); |
767 | memset(befs_sb, 0, sizeof(befs_sb_info)); | 767 | memset(befs_sb, 0, sizeof(befs_sb_info)); |
768 | 768 | ||
769 | if (!parse_options((char *) data, &befs_sb->mount_opts)) { | 769 | if (!parse_options((char *) data, &befs_sb->mount_opts)) { |
770 | befs_error(sb, "cannot parse mount options"); | 770 | befs_error(sb, "cannot parse mount options"); |
771 | goto unaquire_priv_sbp; | 771 | goto unacquire_priv_sbp; |
772 | } | 772 | } |
773 | 773 | ||
774 | befs_debug(sb, "---> befs_fill_super()"); | 774 | befs_debug(sb, "---> befs_fill_super()"); |
@@ -794,7 +794,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
794 | 794 | ||
795 | if (!(bh = sb_bread(sb, sb_block))) { | 795 | if (!(bh = sb_bread(sb, sb_block))) { |
796 | befs_error(sb, "unable to read superblock"); | 796 | befs_error(sb, "unable to read superblock"); |
797 | goto unaquire_priv_sbp; | 797 | goto unacquire_priv_sbp; |
798 | } | 798 | } |
799 | 799 | ||
800 | /* account for offset of super block on x86 */ | 800 | /* account for offset of super block on x86 */ |
@@ -809,20 +809,20 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
809 | } | 809 | } |
810 | 810 | ||
811 | if (befs_load_sb(sb, disk_sb) != BEFS_OK) | 811 | if (befs_load_sb(sb, disk_sb) != BEFS_OK) |
812 | goto unaquire_bh; | 812 | goto unacquire_bh; |
813 | 813 | ||
814 | befs_dump_super_block(sb, disk_sb); | 814 | befs_dump_super_block(sb, disk_sb); |
815 | 815 | ||
816 | brelse(bh); | 816 | brelse(bh); |
817 | 817 | ||
818 | if (befs_check_sb(sb) != BEFS_OK) | 818 | if (befs_check_sb(sb) != BEFS_OK) |
819 | goto unaquire_priv_sbp; | 819 | goto unacquire_priv_sbp; |
820 | 820 | ||
821 | if( befs_sb->num_blocks > ~((sector_t)0) ) { | 821 | if( befs_sb->num_blocks > ~((sector_t)0) ) { |
822 | befs_error(sb, "blocks count: %Lu " | 822 | befs_error(sb, "blocks count: %Lu " |
823 | "is larger than the host can use", | 823 | "is larger than the host can use", |
824 | befs_sb->num_blocks); | 824 | befs_sb->num_blocks); |
825 | goto unaquire_priv_sbp; | 825 | goto unacquire_priv_sbp; |
826 | } | 826 | } |
827 | 827 | ||
828 | /* | 828 | /* |
@@ -838,7 +838,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
838 | if (!sb->s_root) { | 838 | if (!sb->s_root) { |
839 | iput(root); | 839 | iput(root); |
840 | befs_error(sb, "get root inode failed"); | 840 | befs_error(sb, "get root inode failed"); |
841 | goto unaquire_priv_sbp; | 841 | goto unacquire_priv_sbp; |
842 | } | 842 | } |
843 | 843 | ||
844 | /* load nls library */ | 844 | /* load nls library */ |
@@ -860,13 +860,13 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
860 | 860 | ||
861 | return 0; | 861 | return 0; |
862 | /*****************/ | 862 | /*****************/ |
863 | unaquire_bh: | 863 | unacquire_bh: |
864 | brelse(bh); | 864 | brelse(bh); |
865 | 865 | ||
866 | unaquire_priv_sbp: | 866 | unacquire_priv_sbp: |
867 | kfree(sb->s_fs_info); | 867 | kfree(sb->s_fs_info); |
868 | 868 | ||
869 | unaquire_none: | 869 | unacquire_none: |
870 | sb->s_fs_info = NULL; | 870 | sb->s_fs_info = NULL; |
871 | return -EINVAL; | 871 | return -EINVAL; |
872 | } | 872 | } |
@@ -925,18 +925,18 @@ init_befs_fs(void) | |||
925 | 925 | ||
926 | err = befs_init_inodecache(); | 926 | err = befs_init_inodecache(); |
927 | if (err) | 927 | if (err) |
928 | goto unaquire_none; | 928 | goto unacquire_none; |
929 | 929 | ||
930 | err = register_filesystem(&befs_fs_type); | 930 | err = register_filesystem(&befs_fs_type); |
931 | if (err) | 931 | if (err) |
932 | goto unaquire_inodecache; | 932 | goto unacquire_inodecache; |
933 | 933 | ||
934 | return 0; | 934 | return 0; |
935 | 935 | ||
936 | unaquire_inodecache: | 936 | unacquire_inodecache: |
937 | befs_destroy_inodecache(); | 937 | befs_destroy_inodecache(); |
938 | 938 | ||
939 | unaquire_none: | 939 | unacquire_none: |
940 | return err; | 940 | return err; |
941 | } | 941 | } |
942 | 942 | ||
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 5861eb42e626..944d2b9e092d 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -324,7 +324,7 @@ out: | |||
324 | return rc; | 324 | return rc; |
325 | } | 325 | } |
326 | 326 | ||
327 | /* Try to reaquire byte range locks that were released when session */ | 327 | /* Try to reacquire byte range locks that were released when session */ |
328 | /* to server was lost */ | 328 | /* to server was lost */ |
329 | static int cifs_relock_file(struct cifsFileInfo *cifsFile) | 329 | static int cifs_relock_file(struct cifsFileInfo *cifsFile) |
330 | { | 330 | { |
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index ac3d66948e8c..10c46231ce15 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c | |||
@@ -842,7 +842,7 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp, | |||
842 | TXN_UNLOCK(); | 842 | TXN_UNLOCK(); |
843 | release_metapage(mp); | 843 | release_metapage(mp); |
844 | TXN_LOCK(); | 844 | TXN_LOCK(); |
845 | xtid = tlck->tid; /* reaquire after dropping TXN_LOCK */ | 845 | xtid = tlck->tid; /* reacquire after dropping TXN_LOCK */ |
846 | 846 | ||
847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", | 847 | jfs_info("txLock: in waitLock, tid = %d, xtid = %d, lid = %d", |
848 | tid, xtid, lid); | 848 | tid, xtid, lid); |