Changeset b3bf143 in mainline for uspace/srv/fs/fat/fat_directory.c

Timestamp:

2011-09-24T21:29:31Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

113093a

Parents:

f1a9e87 (diff), 40cdbec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/fs.

File:

• uspace/srv/fs/fat/fat_directory.c (modified) (4 diffs)

uspace/srv/fs/fat/fat_directory.c

@@ -262 +262 @@
 {
         int rc;
-        bool enable_lfn = true; /* TODO: make this a mount option */
+        void *data;
+        fat_instance_t *instance;
+
+        rc = fs_instance_get(di->nodep->idx->service_id, &data);
+        assert(rc == EOK);
+        instance = (fat_instance_t *) data;
         
         if (fat_valid_short_name(name)) {
@@ -277 +282 @@
                 rc = fat_directory_write_dentry(di, de);
                 return rc;
-        } else if (enable_lfn && fat_valid_name(name)) {
+        } else if (instance->lfn_enabled && fat_valid_name(name)) {
                 /* We should create long entries to store name */
                 int long_entry_count;
@@ -292 +297 @@
                 if (lfn_size % FAT_LFN_ENTRY_SIZE)
                         long_entry_count++;
-                rc = fat_directory_lookup_free(di, long_entry_count+1);
+                rc = fat_directory_lookup_free(di, long_entry_count + 1);
                 if (rc != EOK)
                         return rc;
@@ -328 +333 @@
                 FAT_LFN_ORDER(d) |= FAT_LFN_LAST;
 
-                rc = fat_directory_seek(di, start_pos+long_entry_count);
+                rc = fat_directory_seek(di, start_pos + long_entry_count);
                 return rc;
         }