[PATCH] JFS: Support page sizes greater than 4K

jfs has never worked on architecutures where the page size was not 4K.

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 21 deletions

diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index 7bc906677b0d..6c04f5eda135 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -175,31 +175,22 @@ jfs_get_blocks(struct inode *ip, sector_t lblock, unsigned long max_blocks,
 {
         s64 lblock64 = lblock;
         int rc = 0;
-        int take_locks;
         xad_t xad;
         s64 xaddr;
         int xflag;
         s32 xlen;
 
         /*
-         * If this is a special inode (imap, dmap)
-         * the lock should already be taken
-         */
-        take_locks = (JFS_IP(ip)->fileset != AGGREGATE_I);
-
-        /*
          * Take appropriate lock on inode
          */
-        if (take_locks) {
-                if (create)
-                        IWRITE_LOCK(ip);
-                else
-                        IREAD_LOCK(ip);
-        }
+        if (create)
+                IWRITE_LOCK(ip);
+        else
+                IREAD_LOCK(ip);
 
         if (((lblock64 << ip->i_sb->s_blocksize_bits) < ip->i_size) &&
-            (xtLookup(ip, lblock64, max_blocks, &xflag, &xaddr, &xlen, 0)
-             == 0) && xlen) {
+            (!xtLookup(ip, lblock64, max_blocks, &xflag, &xaddr, &xlen, 0)) &&
+            xlen) {
                 if (xflag & XAD_NOTRECORDED) {
                         if (!create)
                                 /*
@@ -258,12 +249,10 @@ jfs_get_blocks(struct inode *ip, sector_t lblock, unsigned long max_blocks,
         /*
          * Release lock on inode
          */
-        if (take_locks) {
-                if (create)
-                        IWRITE_UNLOCK(ip);
-                else
-                        IREAD_UNLOCK(ip);
-        }
+        if (create)
+                IWRITE_UNLOCK(ip);
+        else
+                IREAD_UNLOCK(ip);
         return rc;
 }