Merge commit 'v2.6.38-rc1' into kbuild/packaging

1 files changed, 31 insertions, 1 deletions

diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
index 78a05bfcd8eb..003dc0fd7347 100644
--- a/include/linux/fs_struct.h
+++ b/include/linux/fs_struct.h
@@ -2,10 +2,13 @@
 #define _LINUX_FS_STRUCT_H
 
 #include <linux/path.h>
+#include <linux/spinlock.h>
+#include <linux/seqlock.h>
 
 struct fs_struct {
         int users;
-        rwlock_t lock;
+        spinlock_t lock;
+        seqcount_t seq;
         int umask;
         int in_exec;
         struct path root, pwd;
@@ -21,4 +24,31 @@ extern void free_fs_struct(struct fs_struct *);
 extern void daemonize_fs_struct(void);
 extern int unshare_fs_struct(void);
 
+static inline void get_fs_root(struct fs_struct *fs, struct path *root)
+{
+        spin_lock(&fs->lock);
+        *root = fs->root;
+        path_get(root);
+        spin_unlock(&fs->lock);
+}
+
+static inline void get_fs_pwd(struct fs_struct *fs, struct path *pwd)
+{
+        spin_lock(&fs->lock);
+        *pwd = fs->pwd;
+        path_get(pwd);
+        spin_unlock(&fs->lock);
+}
+
+static inline void get_fs_root_and_pwd(struct fs_struct *fs, struct path *root,
+                                       struct path *pwd)
+{
+        spin_lock(&fs->lock);
+        *root = fs->root;
+        path_get(root);
+        *pwd = fs->pwd;
+        path_get(pwd);
+        spin_unlock(&fs->lock);
+}
+
 #endif /* _LINUX_FS_STRUCT_H */