Merge commit 'efc9194bcff84' ("ASoC: hdmi-codec: callback function will be called...

[deliverable/linux.git] / fs / nilfs2 / sufile.c

diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c
index 5b3720414e3419bd5f451f8ffe14366e0d514dd8..1963595a1580193a791b8fa1a3621df957ff7efd 100644 (file)
--- a/fs/nilfs2/sufile.c
+++ b/fs/nilfs2/sufile.c
@@ -13,12 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Written by Koji Sato <koji@osrg.net>.
- * Revised by Ryusuke Konishi <ryusuke@osrg.net>.
+ * Written by Koji Sato.
+ * Revised by Ryusuke Konishi.
  */
 
 #include <linux/kernel.h>
@@ -61,6 +57,7 @@ static unsigned long
 nilfs_sufile_get_blkoff(const struct inode *sufile, __u64 segnum)
 {
        __u64 t = segnum + NILFS_MDT(sufile)->mi_first_entry_offset;
+
        do_div(t, nilfs_sufile_segment_usages_per_block(sufile));
        return (unsigned long)t;
 }
@@ -69,6 +66,7 @@ static unsigned long
 nilfs_sufile_get_offset(const struct inode *sufile, __u64 segnum)
 {
        __u64 t = segnum + NILFS_MDT(sufile)->mi_first_entry_offset;
+
        return do_div(t, nilfs_sufile_segment_usages_per_block(sufile));
 }