lkml.org 
[lkml]   [2008]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] UDF - use UDF_MAX_WRITE_VERSION instead of numbers
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---

Jan, the patch is over current yours for_mm branch

Yep, i know it exceeds 80 column *but* it looks much better
in this way ;)

Index: linux-2.6.git/fs/udf/inode.c
===================================================================
--- linux-2.6.git.orig/fs/udf/inode.c 2008-04-12 22:53:15.000000000 +0400
+++ linux-2.6.git/fs/udf/inode.c 2008-04-12 23:34:28.000000000 +0400
@@ -1732,7 +1732,7 @@ int8_t udf_add_aext(struct inode *inode,
}
if (epos->bh) {
if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
- UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
+ UDF_SB(inode->i_sb)->s_udfrev >= UDF_MAX_WRITE_VERSION)
udf_update_tag(epos->bh->b_data, loffset);
else
udf_update_tag(epos->bh->b_data,
@@ -1754,7 +1754,7 @@ int8_t udf_add_aext(struct inode *inode,
aed = (struct allocExtDesc *)epos->bh->b_data;
le32_add_cpu(&aed->lengthAllocDescs, adsize);
if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
- UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
+ UDF_SB(inode->i_sb)->s_udfrev >= UDF_MAX_WRITE_VERSION)
udf_update_tag(epos->bh->b_data,
epos->offset + (inc ? 0 : adsize));
else
@@ -1802,7 +1802,7 @@ int8_t udf_write_aext(struct inode *inod

if (epos->bh) {
if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
- UDF_SB(inode->i_sb)->s_udfrev >= 0x0201) {
+ UDF_SB(inode->i_sb)->s_udfrev >= UDF_MAX_WRITE_VERSION) {
struct allocExtDesc *aed =
(struct allocExtDesc *)epos->bh->b_data;
udf_update_tag(epos->bh->b_data,
@@ -1968,7 +1968,7 @@ int8_t udf_delete_aext(struct inode *ino
aed = (struct allocExtDesc *)oepos.bh->b_data;
le32_add_cpu(&aed->lengthAllocDescs, -(2 * adsize));
if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
- UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
+ UDF_SB(inode->i_sb)->s_udfrev >= UDF_MAX_WRITE_VERSION)
udf_update_tag(oepos.bh->b_data,
oepos.offset - (2 * adsize));
else
@@ -1985,7 +1985,7 @@ int8_t udf_delete_aext(struct inode *ino
aed = (struct allocExtDesc *)oepos.bh->b_data;
le32_add_cpu(&aed->lengthAllocDescs, -adsize);
if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
- UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
+ UDF_SB(inode->i_sb)->s_udfrev >= UDF_MAX_WRITE_VERSION)
udf_update_tag(oepos.bh->b_data,
epos.offset - adsize);
else
Index: linux-2.6.git/fs/udf/truncate.c
===================================================================
--- linux-2.6.git.orig/fs/udf/truncate.c 2008-04-12 22:53:15.000000000 +0400
+++ linux-2.6.git/fs/udf/truncate.c 2008-04-12 23:31:54.000000000 +0400
@@ -165,7 +165,7 @@ void udf_discard_prealloc(struct inode *
cpu_to_le32(epos.offset -
sizeof(struct allocExtDesc));
if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) ||
- UDF_SB(inode->i_sb)->s_udfrev >= 0x0201)
+ UDF_SB(inode->i_sb)->s_udfrev >= UDF_MAX_WRITE_VERSION)
udf_update_tag(epos.bh->b_data, epos.offset);
else
udf_update_tag(epos.bh->b_data,
@@ -190,7 +190,7 @@ static void udf_update_alloc_ext_desc(st
int len = sizeof(struct allocExtDesc);

aed->lengthAllocDescs = cpu_to_le32(lenalloc);
- if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) || sbi->s_udfrev >= 0x0201)
+ if (!UDF_QUERY_FLAG(sb, UDF_FLAG_STRICT) || sbi->s_udfrev >= UDF_MAX_WRITE_VERSION)
len += lenalloc;

udf_update_tag(epos->bh->b_data, len);

\
 
 \ /
  Last update: 2008-04-12 21:43    [W:0.067 / U:0.288 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site