Skip to content

Commit 13fcc68

Browse files
dhowellsAl Viro
authored andcommitted
afs: Add fs_context support
Add fs_context support to the AFS filesystem, converting the parameter parsing to store options there. This will form the basis for namespace propagation over mountpoints within the AFS model, thereby allowing AFS to be used in containers more easily. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 06a2ae5 commit 13fcc68

File tree

4 files changed

+259
-214
lines changed

4 files changed

+259
-214
lines changed

fs/afs/internal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636
struct pagevec;
3737
struct afs_call;
3838

39-
struct afs_mount_params {
39+
struct afs_fs_context {
4040
bool rwpath; /* T if the parent should be considered R/W */
4141
bool force; /* T to force cell type */
4242
bool autocell; /* T if set auto mount operation */
4343
bool dyn_root; /* T if dynamic root */
44+
bool no_cell; /* T if the source is "none" (for dynroot) */
4445
afs_voltype_t type; /* type of volume requested */
45-
int volnamesz; /* size of volume name */
46+
unsigned int volnamesz; /* size of volume name */
4647
const char *volname; /* name of volume to mount */
47-
struct net *net_ns; /* Network namespace in effect */
4848
struct afs_net *net; /* the AFS net namespace stuff */
4949
struct afs_cell *cell; /* cell in which to find volume */
5050
struct afs_volume *volume; /* volume record */
@@ -1274,7 +1274,7 @@ static inline struct afs_volume *__afs_get_volume(struct afs_volume *volume)
12741274
return volume;
12751275
}
12761276

1277-
extern struct afs_volume *afs_create_volume(struct afs_mount_params *);
1277+
extern struct afs_volume *afs_create_volume(struct afs_fs_context *);
12781278
extern void afs_activate_volume(struct afs_volume *);
12791279
extern void afs_deactivate_volume(struct afs_volume *);
12801280
extern void afs_put_volume(struct afs_cell *, struct afs_volume *);

fs/afs/mntpt.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/mount.h>
1818
#include <linux/namei.h>
1919
#include <linux/gfp.h>
20+
#include <linux/fs_context.h>
2021
#include "internal.h"
2122

2223

0 commit comments

Comments
 (0)