Deleted Added
sdiff udiff text old ( 162647 ) new ( 164033 )
full compact
reiserfs_vfsops.c (162647) reiserfs_vfsops.c (164033)
1/*-
2 * Copyright 2000 Hans Reiser
3 * See README for licensing and copyright details
4 *
5 * Ported to FreeBSD by Jean-S�bastien P�dron <jspedron@club-internet.fr>
6 *
1/*-
2 * Copyright 2000 Hans Reiser
3 * See README for licensing and copyright details
4 *
5 * Ported to FreeBSD by Jean-S�bastien P�dron <jspedron@club-internet.fr>
6 *
7 * $FreeBSD: head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c 162647 2006-09-26 04:12:49Z tegge $
7 * $FreeBSD: head/sys/gnu/fs/reiserfs/reiserfs_vfsops.c 164033 2006-11-06 13:42:10Z rwatson $
8 */
9
10#include <gnu/fs/reiserfs/reiserfs_fs.h>
11
12const char reiserfs_3_5_magic_string[] = REISERFS_SUPER_MAGIC_STRING;
13const char reiserfs_3_6_magic_string[] = REISER2FS_SUPER_MAGIC_STRING;
14const char reiserfs_jr_magic_string[] = REISER2FS_JR_SUPER_MAGIC_STRING;
15

--- 104 unchanged lines hidden (view full) ---

120
121 if (!vn_isdisk(devvp, &error)) {
122 vput(devvp);
123 return (error);
124 }
125
126 /* If mount by non-root, then verify that user has necessary
127 * permissions on the device. */
8 */
9
10#include <gnu/fs/reiserfs/reiserfs_fs.h>
11
12const char reiserfs_3_5_magic_string[] = REISERFS_SUPER_MAGIC_STRING;
13const char reiserfs_3_6_magic_string[] = REISER2FS_SUPER_MAGIC_STRING;
14const char reiserfs_jr_magic_string[] = REISER2FS_JR_SUPER_MAGIC_STRING;
15

--- 104 unchanged lines hidden (view full) ---

120
121 if (!vn_isdisk(devvp, &error)) {
122 vput(devvp);
123 return (error);
124 }
125
126 /* If mount by non-root, then verify that user has necessary
127 * permissions on the device. */
128 if (suser(td)) {
129 accessmode = VREAD;
130 if ((mp->mnt_flag & MNT_RDONLY) == 0)
131 accessmode |= VWRITE;
132 if ((error = VOP_ACCESS(devvp,
133 accessmode, td->td_ucred, td)) != 0) {
134 vput(devvp);
135 return (error);
136 }
128 accessmode = VREAD;
129 if ((mp->mnt_flag & MNT_RDONLY) == 0)
130 accessmode |= VWRITE;
131 error = VOP_ACCESS(devvp, accessmode, td->td_ucred, td);
132 if (error)
133 error = priv_check(td, PRIV_VFS_MOUNT_PERM);
134 if (error) {
135 vput(devvp);
136 return (error);
137 }
138
139 if ((mp->mnt_flag & MNT_UPDATE) == 0) {
140 error = reiserfs_mountfs(devvp, mp, td);
141 } else {
142 /* TODO Handle MNT_UPDATE */
143 vput(devvp);
144 return (EOPNOTSUPP);

--- 1042 unchanged lines hidden --- 		137 }
138
139 if ((mp->mnt_flag & MNT_UPDATE) == 0) {
140 error = reiserfs_mountfs(devvp, mp, td);
141 } else {
142 /* TODO Handle MNT_UPDATE */
143 vput(devvp);
144 return (EOPNOTSUPP);

--- 1042 unchanged lines hidden ---