Skip to content

Commit 15f6148

Browse files
stancheffOleg Drokin
authored andcommitted
LU-12400 osd-ldiskfs: get rid of legacy 'get_ds()' function
get rid of legacy 'get_ds()' function Every in-kernel use of this function defined it to KERNEL_DS (either as an actual define, or as an inline function). Linux-commit: 736706bee3298208343a76096370e4f6a5c55915 Test-Parameters: trivial Signed-off-by: Shaun Tancheff <[email protected]> Change-Id: I3aabe74802f1a953b140728f22c83125dae270c3 Reviewed-on: https://review.whamcloud.com/35238 Tested-by: jenkins <[email protected]> Tested-by: Maloo <[email protected]> Reviewed-by: Petros Koutoupis <[email protected]> Reviewed-by: James Simmons <[email protected]> Reviewed-by: Oleg Drokin <[email protected]>
1 parent a06b656 commit 15f6148

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

libcfs/libcfs/linux/linux-prim.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ int cfs_kernel_write(struct file *filp, const void *buf, size_t count,
111111
mm_segment_t __old_fs = get_fs();
112112
int rc;
113113

114-
set_fs(get_ds());
114+
set_fs(KERNEL_DS);
115115
rc = vfs_write(filp, (__force const char __user *)buf, count, pos);
116116
set_fs(__old_fs);
117117

lustre/osd-ldiskfs/osd_compat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static void osd_push_ctxt(const struct osd_device *dev,
5959
OBD_SET_CTXT_MAGIC(newctxt);
6060
newctxt->pwdmnt = dev->od_mnt;
6161
newctxt->pwd = dev->od_mnt->mnt_root;
62-
newctxt->fs = get_ds();
62+
newctxt->fs = KERNEL_DS;
6363
newctxt->umask = current_umask();
6464
newctxt->dt = NULL;
6565

lustre/osd-ldiskfs/osd_io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ static int osd_is_mapped(struct dt_object *dt, __u64 offset,
13741374
fei.fi_extents_start = &fe;
13751375

13761376
saved_fs = get_fs();
1377-
set_fs(get_ds());
1377+
set_fs(KERNEL_DS);
13781378
rc = inode->i_op->fiemap(inode, &fei, offset, FIEMAP_MAX_OFFSET-offset);
13791379
set_fs(saved_fs);
13801380
if (rc != 0)
@@ -2258,7 +2258,7 @@ static int osd_fiemap_get(const struct lu_env *env, struct dt_object *dt,
22582258
/* Save previous value address limit */
22592259
cur_fs = get_fs();
22602260
/* Set the address limit of the kernel */
2261-
set_fs(get_ds());
2261+
set_fs(KERNEL_DS);
22622262

22632263
rc = inode->i_op->fiemap(inode, &fieinfo, fm->fm_start, len);
22642264
fm->fm_flags = fieinfo.fi_flags;

lustre/osd-ldiskfs/osd_scrub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2594,7 +2594,7 @@ int osd_scrub_setup(const struct lu_env *env, struct osd_device *dev)
25942594
OBD_SET_CTXT_MAGIC(ctxt);
25952595
ctxt->pwdmnt = dev->od_mnt;
25962596
ctxt->pwd = dev->od_mnt->mnt_root;
2597-
ctxt->fs = get_ds();
2597+
ctxt->fs = KERNEL_DS;
25982598

25992599
init_waitqueue_head(&scrub->os_thread.t_ctl_waitq);
26002600
init_rwsem(&scrub->os_rwsem);

lustre/ptlrpc/sec_ctx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
/* Debugging check only needed during development */
3838
#ifdef OBD_CTXT_DEBUG
3939
# define ASSERT_CTXT_MAGIC(magic) LASSERT((magic) == OBD_RUN_CTXT_MAGIC)
40-
# define ASSERT_NOT_KERNEL_CTXT(msg) LASSERTF(!segment_eq(get_fs(), get_ds()),\
40+
# define ASSERT_NOT_KERNEL_CTXT(msg) LASSERTF(!segment_eq(get_fs(), KERNEL_DS),\
4141
msg)
42-
# define ASSERT_KERNEL_CTXT(msg) LASSERTF(segment_eq(get_fs(), get_ds()), msg)
42+
# define ASSERT_KERNEL_CTXT(msg) LASSERTF(segment_eq(get_fs(), KERNEL_DS), msg)
4343
#else
4444
# define ASSERT_CTXT_MAGIC(magic) do {} while(0)
4545
# define ASSERT_NOT_KERNEL_CTXT(msg) do {} while(0)

0 commit comments

Comments
 (0)