Changeset 778d26d in mainline for uspace/lib

Timestamp:

2013-07-28T21:06:34Z (13 years ago)

Author:

Jiri Zarevucky <zarevucky.jiri@…>

Branches:

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

Children:

9e9b168

Parents:

bf9dc4e2

Message:

Relativize rename().

Location:

uspace/lib

Files:

• c/generic/vfs/vfs.c (modified) (1 diff)
• c/include/ipc/vfs.h (modified) (1 diff)
• fs/libfs.c (modified) (2 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -730 +730 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_0(exch, VFS_IN_RENAME, NULL);
+        req = async_send_1(exch, VFS_IN_RENAME, -1, NULL);
         rc = async_data_write_start(exch, olda, olda_size);
         if (rc != EOK) {

uspace/lib/c/include/ipc/vfs.h

@@ -126 +126 @@
 
 /**
+ * Lookup will not cross any mount points.
+ * If the lookup would have to cross a mount point, it returns EXDEV instead.
+ */
+#define L_DISABLE_MOUNTS        4
+
+/**
  * Lookup will succeed only if the object is a mount point. The flag is mutually
  * exclusive with L_FILE and L_ROOT.

uspace/lib/fs/libfs.c

@@ -632 +632 @@
         
         if (cur->mp_data.mp_active) {
+                if (lflag & L_DISABLE_MOUNTS) {
+                        async_answer_0(rid, EXDEV);
+                        LOG_EXIT(EXDEV);
+                        goto out;
+                }
+                
                 async_exch_t *exch = async_exchange_begin(cur->mp_data.sess);
                 async_forward_slow(rid, exch, VFS_OUT_LOOKUP, next, last - next,
@@ -692 +698 @@
                 if ((tmp) && (tmp->mp_data.mp_active) &&
                     (!(lflag & L_MP) || (next < last))) {
+                        
+                        if (lflag & L_DISABLE_MOUNTS) {
+                                async_answer_0(rid, EXDEV);
+                                LOG_EXIT(EXDEV);
+                                goto out;
+                        }
+                        
                         async_exch_t *exch = async_exchange_begin(tmp->mp_data.sess);
                         async_forward_slow(rid, exch, VFS_OUT_LOOKUP, next,