]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ocfs2: remove useless err
authorAlex Shi <alex.shi@linux.alibaba.com>
Thu, 2 Apr 2020 04:03:41 +0000 (21:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Apr 2020 16:35:25 +0000 (09:35 -0700)
We don't need 'err' in these 2 places, better to remove them.

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: ChenGang <cg.chen@huawei.com>
Cc: Richard Fontana <rfontana@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1579577836-251879-1-git-send-email-alex.shi@linux.alibaba.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/cluster/tcp.c
fs/ocfs2/dir.c

index 48a3398f0bf546d0d8cedc8c11e76abc595d6715..9261c1f06a9ff458e61c743ccc8afbe987b8dd27 100644 (file)
@@ -1948,7 +1948,6 @@ static void o2net_accept_many(struct work_struct *work)
 {
        struct socket *sock = o2net_listen_sock;
        int     more;
-       int     err;
 
        /*
         * It is critical to note that due to interrupt moderation
@@ -1963,7 +1962,7 @@ static void o2net_accept_many(struct work_struct *work)
         */
 
        for (;;) {
-               err = o2net_accept_one(sock, &more);
+               o2net_accept_one(sock, &more);
                if (!more)
                        break;
                cond_resched();
index bdef72c0f0991c7c74b2322be331b7fd88c54a3c..5761060d2ba80b053923d38ac84c9ced0b7c6533 100644 (file)
@@ -676,7 +676,7 @@ static struct buffer_head *ocfs2_find_entry_el(const char *name, int namelen,
        int ra_ptr = 0;         /* Current index into readahead
                                   buffer */
        int num = 0;
-       int nblocks, i, err;
+       int nblocks, i;
 
        sb = dir->i_sb;
 
@@ -708,7 +708,7 @@ restart:
                                num++;
 
                                bh = NULL;
-                               err = ocfs2_read_dir_block(dir, b++, &bh,
+                               ocfs2_read_dir_block(dir, b++, &bh,
                                                           OCFS2_BH_READAHEAD);
                                bh_use[ra_max] = bh;
                        }