Try a more compatible syntax

diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index 0fbfbd77a91ae3221be56fdd4184196839312c77..f5884e20ab77c49d7c3596b5402374e154887332 100644 (file)
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -127,7 +127,7 @@ static int reiserfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                                        /* There is corrupted data in entry,
                                         * We'd better stop here */
                                        pathrelse(&path_to_entry);
-                                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                                        ret = -EIO;
                                        goto out;
                                }

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 28b77b3be9902b3a560efeed7991c257facfac74..ee74f1d8494c58b243d45745c45ed74913020a0d 100644 (file)
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -151,7 +151,7 @@ static int reiserfs_sync_file(struct file *p_s_filp,
        if (barrier_done < 0)
                return barrier_done;
        if (n_err < 0) {
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        } else {
                return 0;

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index d72c3bbc860497e415cf59c23d24da9b0fd7d9c7..62a3d98ec1038f3a9e6bcf7902b3e9855d87dbdd 100644 (file)
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -874,7 +874,7 @@ static int write_ordered_buffers(spinlock_t * lock,
                 */
                if (!buffer_uptodate(bh) && buffer_dirty(bh)) {
                        clear_buffer_dirty(bh);
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        ret = -EIO;
                }
                if (buffer_dirty(bh)) {
@@ -905,7 +905,7 @@ static int write_ordered_buffers(spinlock_t * lock,
                        spin_lock(lock);
                }
                if (!buffer_uptodate(bh)) {
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        ret = -EIO;
                }
                /* ugly interaction with invalidatepage here.
@@ -1126,7 +1126,7 @@ static int flush_commit_list(struct super_block *s,
 #ifdef CONFIG_REISERFS_CHECK
                        reiserfs_warning(s, "journal-601, buffer write failed");
 #endif
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        retval = -EIO;
                }
                put_bh(tbh);    /* once for journal_find_get_block */
@@ -1159,7 +1159,7 @@ static int flush_commit_list(struct super_block *s,
 #ifdef CONFIG_REISERFS_CHECK
                reiserfs_warning(s, "journal-615: buffer write failed");
 #endif
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                retval = -EIO;
        }
        bforget(jl->j_commit_bh);
@@ -1285,7 +1285,7 @@ static int _update_journal_header_block(struct super_block *p_s_sb,
        struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
 
        if (reiserfs_is_journal_aborted(journal)) {
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        }
 
@@ -3152,7 +3152,7 @@ int reiserfs_end_persistent_transaction(struct reiserfs_transaction_handle *th)
                ret = journal_end(th, th->t_super, th->t_blocks_allocated);
        } else {
                ret = -EIO;
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
        }
        if (th->t_refcount == 0) {
                SB_JOURNAL(s)->j_persistent_trans--;
@@ -3352,7 +3352,7 @@ int journal_end(struct reiserfs_transaction_handle *th,
 
        if (!th->t_trans_id) {
                WARN_ON(1);
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        }
 

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 420851adf66f96c7d5b6c7974f759ac34d50843c..b15775d45df60f4d76842db0c362cb5dacd6e17e 100644 (file)
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -367,7 +367,7 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry,
        }
        reiserfs_write_unlock(dir->i_sb);
        if (retval == IO_ERROR) {
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return ERR_PTR(-EIO);
        }
 
@@ -490,7 +490,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
                pathrelse(&path);
 
                if (retval == IO_ERROR) {
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        return -EIO;
                }
 
@@ -881,7 +881,7 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
                retval = -ENOENT;
                goto end_rmdir;
        } else if (retval == IO_ERROR) {
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                retval = -EIO;
                goto end_rmdir;
        }
@@ -894,7 +894,7 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
        if (de.de_objectid != inode->i_ino) {
                // FIXME: compare key of an object and a key found in the
                // entry
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                retval = -EIO;
                goto end_rmdir;
        }
@@ -972,7 +972,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
                retval = -ENOENT;
                goto end_unlink;
        } else if (retval == IO_ERROR) {
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                retval = -EIO;
                goto end_unlink;
        }
@@ -983,7 +983,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
        if (de.de_objectid != inode->i_ino) {
                // FIXME: compare key of an object and a key found in the
                // entry
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                retval = -EIO;
                goto end_unlink;
        }
@@ -1272,7 +1272,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
        pathrelse(&old_entry_path);
        if (retval == IO_ERROR) {
                reiserfs_write_unlock(old_dir->i_sb);
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        }
 
@@ -1304,14 +1304,14 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                pathrelse(&dot_dot_entry_path);
                if (retval != NAME_FOUND) {
                        reiserfs_write_unlock(old_dir->i_sb);
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        return -EIO;
                }
 
                /* inode number of .. must equal old_dir->i_ino */
                if (dot_dot_de.de_objectid != old_dir->i_ino) {
                        reiserfs_write_unlock(old_dir->i_sb);
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        return -EIO;
                }
        }
@@ -1357,7 +1357,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                        pathrelse(&old_entry_path);
                        journal_end(&th, old_dir->i_sb, jbegin_count);
                        reiserfs_write_unlock(old_dir->i_sb);
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        return -EIO;
                }
 
@@ -1378,7 +1378,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                        pathrelse(&old_entry_path);
                        journal_end(&th, old_dir->i_sb, jbegin_count);
                        reiserfs_write_unlock(old_dir->i_sb);
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        return -EIO;
                }
 
@@ -1397,7 +1397,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                                pathrelse(&old_entry_path);
                                journal_end(&th, old_dir->i_sb, jbegin_count);
                                reiserfs_write_unlock(old_dir->i_sb);
-                               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                                return -EIO;
                        }
                        copy_item_head(&dot_dot_ih,

diff --git a/fs/reiserfs/resize.c b/fs/reiserfs/resize.c
index 9f54c0e10ed708d2a7690f577a49e38610e5056f..21d838d9cefd45747de0f1dff42763961df73975 100644 (file)
--- a/fs/reiserfs/resize.c
+++ b/fs/reiserfs/resize.c
@@ -134,7 +134,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
                        bh = sb_bread(s, i * s->s_blocksize * 8);
                        if (!bh) {
                                vfree(bitmap);
-                               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                                return -EIO;
                        }
                        memset(bh->b_data, 0, sb_blocksize(sb));
@@ -167,7 +167,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
                int jerr = journal_end(&th, s, 10);
                if (jerr)
                        return jerr;
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        }
 
@@ -186,7 +186,7 @@ int reiserfs_resize(struct super_block *s, unsigned long block_count_new)
                int jerr = journal_end(&th, s, 10);
                if (jerr)
                        return jerr;
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        }
 

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 2d77facf90910dd2963917f9265f42171f34a623..0af47671885ed4a5f4e4c5f9fcfb44e52908b3a7 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -1656,7 +1656,7 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
                if (n_ret_value == NO_DISK_SPACE)
                        reiserfs_warning(p_s_sb, "NO_DISK_SPACE");
                unfix_nodes(&s_cut_balance);
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        }
 
@@ -1997,7 +1997,7 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree
                    search_for_position_by_key(th->t_super, p_s_key,
                                               p_s_search_path);
                if (retval == IO_ERROR) {
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        retval = -EIO;
                        goto error_out;
                }
@@ -2085,7 +2085,7 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th, struct treepath
                PROC_INFO_INC(th->t_super, insert_item_restarted);
                retval = search_item(th->t_super, key, p_s_path);
                if (retval == IO_ERROR) {
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        retval = -EIO;
                        goto error_out;
                }

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 379961f0a538bdc46d9fb4d7685504a0a624eedc..27ef65a808dbeee4c61a8e4176573fde0b708d9b 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -2154,7 +2154,7 @@ static ssize_t reiserfs_quota_read(struct super_block *sb, int type, char *data,
                else {
                        bh = sb_bread(sb, tmp_bh.b_blocknr);
                        if (!bh) {
-                               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                                return -EIO;
                        }
                        memcpy(data, bh->b_data + offset, tocopy);
@@ -2199,7 +2199,7 @@ static ssize_t reiserfs_quota_write(struct super_block *sb, int type,
                else
                        bh = sb_getblk(sb, tmp_bh.b_blocknr);
                if (!bh) {
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        err = -EIO;
                        goto out;
                }

diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c
index 49d439555688133885ae94c229286684565392c8..181e438bd078675a99bd6d1814e55e8f56018c07 100644 (file)
--- a/fs/reiserfs/tail_conversion.c
+++ b/fs/reiserfs/tail_conversion.c
@@ -52,7 +52,7 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,
                                 "pasted or inserted byte exists in the tree %K. "
                                 "Use fsck to repair.", &end_key);
                pathrelse(path);
-               printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+               printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                return -EIO;
        }
 

diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index 289d9d06cab498bf59587f1bac66c46277badf7c..729b991694db9031d41d785692be19b45db813cb 100644 (file)
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -245,7 +245,7 @@ static int __xattr_readdir(struct inode *inode, void *dirent, filldir_t filldir)
                        // FIXME: we could just skip part of directory which could
                        // not be read
                        pathrelse(&path_to_entry);
-                       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+                       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
                        return -EIO;
                }
 
@@ -393,7 +393,7 @@ static struct page *reiserfs_get_page(struct inode *dir, unsigned long n)
 
       fail:
        reiserfs_put_page(page);
-       printk("reiserfs: returning EIO at " __FILE__ ":" #__LINE__ "\n");
+       printk("reiserfs: returning EIO at %s:%d\n", __FILE__, __LINE__);
        return ERR_PTR(-EIO);
 }