8139too: Fall back to PIO when MMIO fails.

[safe/jmp/linux-2.6] / fs / reiserfs / namei.c

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index a216184..c1add28 100644 (file)
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -16,7 +16,6 @@
 #include <linux/reiserfs_fs.h>
 #include <linux/reiserfs_acl.h>
 #include <linux/reiserfs_xattr.h>
-#include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 
 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
@@ -302,7 +301,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen,
                                        path_to_entry, de);
                if (retval == IO_ERROR) {
                        reiserfs_warning(dir->i_sb, "zam-7001: io error in %s",
-                                        __FUNCTION__);
+                                        __func__);
                        return IO_ERROR;
                }
 
@@ -453,7 +452,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
        buflen = DEH_SIZE + ROUND_UP(namelen);
        if (buflen > sizeof(small_buf)) {
                buffer = kmalloc(buflen, GFP_NOFS);
-               if (buffer == 0)
+               if (!buffer)
                        return -ENOMEM;
        } else
                buffer = small_buf;
@@ -497,7 +496,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,
                        reiserfs_warning(dir->i_sb,
                                         "zam-7002:%s: \"reiserfs_find_entry\" "
                                         "has returned unexpected value (%d)",
-                                        __FUNCTION__, retval);
+                                        __func__, retval);
                }
 
                return -EEXIST;
@@ -908,7 +907,7 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)
 
        if (inode->i_nlink != 2 && inode->i_nlink != 1)
                reiserfs_warning(inode->i_sb, "%s: empty directory has nlink "
-                                "!= 2 (%d)", __FUNCTION__, inode->i_nlink);
+                                "!= 2 (%d)", __func__, inode->i_nlink);
 
        clear_nlink(inode);
        inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
@@ -985,7 +984,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)
 
        if (!inode->i_nlink) {
                reiserfs_warning(inode->i_sb, "%s: deleting nonexistent file "
-                                "(%s:%lu), %d", __FUNCTION__,
+                                "(%s:%lu), %d", __func__,
                                 reiserfs_bdevname(inode->i_sb), inode->i_ino,
                                 inode->i_nlink);
                inode->i_nlink = 1;