From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 4/6] GFS2: fs/gfs2/bmap.c: kernel-doc warning fixes
Date: Tue, 3 Jun 2014 12:02:31 +0100 [thread overview]
Message-ID: <1401793353-1469-5-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1401793353-1469-1-git-send-email-swhiteho@redhat.com>
From: Fabian Frederick <fabf@skynet.be>
Fix 2 typos and move one definition which was between function
comments and function definition (yet another kernel-doc warning)
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index c62d4b9..e6ee5b6 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -707,7 +707,7 @@ int gfs2_extent_map(struct inode *inode, u64 lblock, int *new, u64 *dblock, unsi
* @top: The first pointer in the buffer
* @bottom: One more than the last pointer
* @height: the height this buffer is at
- * @data: a pointer to a struct strip_mine
+ * @sm: a pointer to a struct strip_mine
*
* Returns: errno
*/
@@ -992,6 +992,8 @@ unlock:
return err;
}
+#define GFS2_JTRUNC_REVOKES 8192
+
/**
* gfs2_journaled_truncate - Wrapper for truncate_pagecache for jdata files
* @inode: The inode being truncated
@@ -1003,8 +1005,6 @@ unlock:
* if the number of pages being truncated gets too large.
*/
-#define GFS2_JTRUNC_REVOKES 8192
-
static int gfs2_journaled_truncate(struct inode *inode, u64 oldsize, u64 newsize)
{
struct gfs2_sbd *sdp = GFS2_SB(inode);
@@ -1348,7 +1348,7 @@ void gfs2_free_journal_extents(struct gfs2_jdesc *jd)
* gfs2_add_jextent - Add or merge a new extent to extent cache
* @jd: The journal descriptor
* @lblock: The logical block at start of new extent
- * @pblock: The physical block at start of new extent
+ * @dblock: The physical block at start of new extent
* @blocks: Size of extent in fs blocks
*
* Returns: 0 on success or -ENOMEM
--
1.8.3.1
next prev parent reply other threads:[~2014-06-03 11:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 11:02 [Cluster-devel] GFS2: Pre-pull patch posting (merge window) Steven Whitehouse
2014-06-03 11:02 ` [Cluster-devel] [PATCH 1/6] GFS2: quotas not being refreshed in gfs2_adjust_quota Steven Whitehouse
2014-06-03 11:02 ` [Cluster-devel] [PATCH 2/6] GFS2: lops.c: replace 0 by NULL for pointers Steven Whitehouse
2014-06-03 11:02 ` [Cluster-devel] [PATCH 3/6] GFS2: remove transaction glock Steven Whitehouse
2014-06-03 11:02 ` Steven Whitehouse [this message]
2014-06-03 11:02 ` [Cluster-devel] [PATCH 5/6] GFS2: fs/gfs2/file.c: kernel-doc warning fixes Steven Whitehouse
2014-06-03 11:02 ` [Cluster-devel] [PATCH 6/6] GFS2: Prevent recovery before the local journal is set Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401793353-1469-5-git-send-email-swhiteho@redhat.com \
--to=swhiteho@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).